3 # Rebuild "pu" from topic branches.
8 git reset --hard master &&
9 ORIG_HEAD=`git rev-parse ORIG_HEAD` || exit
15 HH=`cd .git/refs/heads && find -type f |
16 sed -e 's/^\.\///' -e '/^master$/d' -e '/^maint$/d' -e '/^pu$/d'`
27 echo -n "Merge which ones (0 to finish)? "
48 git pull -n . $USE || exit
57 (IFS=",$IFS"; git pull -n . $H) || exit
60 (IFS=",$IFS"; git show-branch master pu $* $ORIG_HEAD)