From: Junio C Hamano <junkio@cox.net>
Date: Tue, 21 Feb 2006 03:43:02 +0000 (-0800)
Subject: PU - --continue.
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=b164a7b7158040e5ba5d2d210c2d8bb3abea9d27;p=git.git

PU - --continue.
---

diff --git a/Doit b/Doit
index a9f91a6e..520e0361 100755
--- 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
index 2a22632a..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='
 '