]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 40e2524) | patch
Do git reset --hard HEAD when using git rebase --skip
authorMike Hommey <mh@glandium.org>
Thu, 8 Nov 2007 07:03:06 +0000 (08:03 +0100)
committerJunio C Hamano <gitster@pobox.com>
Mon, 12 Nov 2007 01:04:59 +0000 (17:04 -0800)
commitfb6e4e1f3f048898677f3cf177bfcaf60123bd5c
tree01155796459a196d41c9a755df66aaa31b0df008tree | snapshot
parent40e2524da9f9fb2806a66a694b9aee722ea3ef0acommit | diff
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>
git-rebase.sh diff | blob | blame | history
t/t3403-rebase-skip.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.