PU - --continue.
Junio C Hamano committed
Feb 20, 2006 at 19:43 UTC
b164a7b7158040e5ba5d2d210c2d8bb3abea9d27
2 files changed
+10
-3
Doit
+1
-1
index a9f91a6e9c..520e03616c 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."
PU
+9
-2
index 2a22632a82..4b4be2ba42 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='
'