From fb6e4e1f3f048898677f3cf177bfcaf60123bd5c Mon Sep 17 00:00:00 2001 From: Mike Hommey Date: Thu, 8 Nov 2007 08:03:06 +0100 Subject: 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 Signed-off-by: Junio C Hamano --- git-rebase.sh | 1 + 1 file changed, 1 insertion(+) (limited to 'git-rebase.sh') diff --git a/git-rebase.sh b/git-rebase.sh index 224cca98e..9af9da992 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 -- cgit v1.2.1