projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dodoc: adjust to "git add ." complaints.
[git.git]
/
PU
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
*) 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='
'
ORIG_HEAD=`git rev-parse ORIG_HEAD` || exit
LF='
'