PU - --continue.
Junio C Hamano committed
Feb 20, 2006 at 19:43 UTC
b164a7b7158040e5ba5d2d210c2d8bb3abea9d27
2 files changed
+10
-3
Doit
+1
-1
@@ -1,6 +1,6 @@
1
#!/bin/sh
2
3
-J='-l 1.5 -j'
3
+J=
4
5
test -z "$(git diff --cached --name-status)" || {
6
echo >&2 "Repository unclean."
PU
+9
-2
@@ -9,8 +9,15 @@ case "$(git-diff-index --name-status HEAD)" in
9
*) echo 2>&1 "Local modifications exist."
10
exit 1;;
11
esac
12
-git checkout pu &&
13
-git reset --hard master &&
12
+
13
+case "$1" in
14
+--continue)
15
+ shift
16
+ ;;
17
+*)
18
+ git checkout pu &&
19
+ git reset --hard master || exit
20
+esac
21
ORIG_HEAD=`git rev-parse ORIG_HEAD` || exit
22
LF='
23
'