PU - --continue.

Junio C Hamano · Junio C Hamano · commit b164a7b71580 · 2006-02-20T19:43:02.000-08:00
diff --git a/Doit b/Doit
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-J='-l 1.5 -j'
+J=
 
 test -z "$(git diff --cached --name-status)" || {
 	echo >&2 "Repository unclean."
diff --git 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='
 '
