summaryrefslogtreecommitdiff
path: root/git-rebase.sh
diff options
context:
space:
mode:
authorMike Hommey <mh@glandium.org>2007-11-08 07:03:06 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-11-12 01:04:59 (GMT)
commitfb6e4e1f3f048898677f3cf177bfcaf60123bd5c (patch)
tree01155796459a196d41c9a755df66aaa31b0df008 /git-rebase.sh
parent40e2524da9f9fb2806a66a694b9aee722ea3ef0a (diff)
downloadgit-fb6e4e1f3f048898677f3cf177bfcaf60123bd5c.zip
git-fb6e4e1f3f048898677f3cf177bfcaf60123bd5c.tar.gz
git-fb6e4e1f3f048898677f3cf177bfcaf60123bd5c.tar.bz2
Do git reset --hard HEAD when using git rebase --skip
When you have a merge conflict and want to bypass the commit causing it, you don't want to care about the dirty state of the working tree. Also, don't git reset --hard HEAD in the rebase-skip test, so that the lack of support for this is detected. Signed-off-by: Mike Hommey <mh@glandium.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 224cca9..9af9da9 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -157,6 +157,7 @@ do
exit
;;
--skip)
+ git reset --hard HEAD || exit $?
if test -d "$dotest"
then
git rerere clear