Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Deprecate peek-remote
[gitweb.git]
/
git-rebase.sh
diff --git
a/git-rebase.sh
b/git-rebase.sh
index c059749bbd5bc1e5bf4103c09b4935c46c965431..461ca8d93f4ab5c43792b4658d53b2e39ad18af1 100755
(executable)
--- a/
git-rebase.sh
+++ b/
git-rebase.sh
@@
-29,6
+29,7
@@
Example: git-rebase master~1 topic
'
SUBDIRECTORY_OK=Yes
+OPTIONS_SPEC=
. git-sh-setup
set_reflog_action rebase
require_work_tree
@@
-178,6
+179,7
@@
do
exit
;;
--skip)
+ git reset --hard HEAD || exit $?
if test -d "$dotest"
then
git rerere clear