projects
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f00c80b
)
PU - --continue.
author
Junio C Hamano
<junkio@cox.net>
Tue, 21 Feb 2006 03:43:02 +0000
(19:43 -0800)
committer
Junio C Hamano
<junkio@cox.net>
Tue, 21 Feb 2006 03:43:02 +0000
(19:43 -0800)
Doit
patch
|
blob
|
history
PU
patch
|
blob
|
history
diff --git
a/Doit
b/Doit
index
a9f91a6
..
520e036
100755
(executable)
--- 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
2a22632
..
4b4be2b
100755
(executable)
--- 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='
'