X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=PU;h=4b4be2ba42af34f82a03092f2523ad1c7ef8e008;hb=cb71bc83592a6475241d78f054aefb75144d74f2;hp=c96ccbc486d4c8e74831757f5fad35612b70426d;hpb=8158d510c641e2354cf24a10bc3e994c7a1e3125;p=git.git

diff --git a/PU b/PU
index c96ccbc4..4b4be2ba 100755
--- a/PU
+++ b/PU
@@ -9,8 +9,15 @@ case "$(git-diff-index --name-status HEAD)" in
 *)	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='
 '
@@ -66,7 +73,8 @@ case "$#" in
 			esac
 		done
 		USED=`expr "$USED" : ',\(.*\)'`
-		git merge -n "Merge $USED" pu $USE || exit
+		git pull -n . $USE || exit
+		# git merge -n "Merge $USED" pu $USE || exit
 		HH=$UNUSE
 	done
 	exit
@@ -75,7 +83,8 @@ esac
 
 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`)