summaryrefslogtreecommitdiff
path: root/git-rebase.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-11-24 16:31:08 -0800
committerJunio C Hamano <gitster@pobox.com>2007-11-24 16:31:08 -0800
commit25f3cd527dec9909322a0f76458a0b602de61141 (patch)
tree6cac35cf7435f159c3d346a06abf05ebc633eac9 /git-rebase.sh
parentfaf8280850e9af4ef63decd8d4e65a7609544c21 (diff)
parentfb6e4e1f3f048898677f3cf177bfcaf60123bd5c (diff)
downloadgit-25f3cd527dec9909322a0f76458a0b602de61141.tar.gz
Merge branch 'mh/rebase-skip-hard'
* mh/rebase-skip-hard: Do git reset --hard HEAD when using git rebase --skip
Diffstat (limited to 'git-rebase.sh')
-rwxr-xr-xgit-rebase.sh1
1 files changed, 1 insertions, 0 deletions
diff --git a/git-rebase.sh b/git-rebase.sh
index df5fd65d56..461ca8d93f 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -179,6 +179,7 @@ do
exit
;;
--skip)
+ git reset --hard HEAD || exit $?
if test -d "$dotest"
then
git rerere clear