verbose git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
# TODO remove this line later
- git config core.autocrlf input
- git config core.safecrlf true
+ verbose git config core.autocrlf input
+ verbose git config core.safecrlf true
r=`git symbolic-ref HEAD`
r=${r#refs/heads/}
done
rm -rf "$patchdir"
;;
+ admin-merge)
+ for d in $repos; do
+ enter "$d0/$d" verbose
+ git rev-parse "$1/$2" || continue
+ # 1. review
+ {
+ git log HEAD.."$1/$2"
+ git diff HEAD..."$1/$2"
+ } | less
+ a=
+ while [ x"$a" != x"y" -a x"$a" != x"n" ]; do
+ echo "Merge \"$1/$2\" into `git symbolic-ref HEAD` of $d?"
+ read -r a
+ done
+ if [ x"$a" = x"y" ]; then
+ git merge "$1/$2"
+ cd "$d0"
+ a=
+ if ! "$SELF" compile; then
+ a=n
+ fi
+ cd "$d0/d"
+ while [ x"$a" != x"y" -a x"$a" != x"n" ]; do
+ echo "Still merge \"$1/$2\" into `git symbolic-ref HEAD` of $d? Maybe you want to test first."
+ read -r a
+ done
+ if [ x"$a" = x"y" ]; then
+ git push origin HEAD
+ git push "$1" :"$2"
+ else
+ git reset --hard HEAD@{1}
+ fi
+ fi
+ done
+ ;;
*)
echo "Usage:"
echo " $SELF pull"