*) echo 2>&1 "Local modifications exist."
exit 1;;
esac
-git checkout pu &&
-git reset --hard master &&
+
+case "$1" in
+--continue)
+ shift
+ ;;
+*)
+ git checkout pu &&
+ git reset --hard master || exit
+esac
ORIG_HEAD=`git rev-parse ORIG_HEAD` || exit
LF='
'
break ;;
esac
I=0
- UNUSE=
- USE=
+ UNUSE= USE= USED=
for H in $HH
do
I=$(($I+1))
case " $ans " in
*' '$I' '*)
USE="$USE$H "
+ USED="$USED,$H"
;;
*)
UNUSE="$UNUSE$H "
;;
esac
done
+ USED=`expr "$USED" : ',\(.*\)'`
git pull -n . $USE || exit
+ # git merge -n "Merge $USED" pu $USE || exit
HH=$UNUSE
done
exit
for H
do
+# (IFS=",$IFS"; git merge -n "Merge $H" pu $H) || exit
(IFS=",$IFS"; git pull -n . $H) || exit
done
-(IFS=",$IFS"; git show-branch master pu $* $ORIG_HEAD)
+(IFS=",$IFS"; git show-branch master $* pu `git rev-parse --short $ORIG_HEAD`)