| commit | fb6e4e1f3f048898677f3cf177bfcaf60123bd5c | |
| author | Mike Hommey <mh@glandium.org> | |
| Thu, 8 Nov 2007 07:03:06 +0000 (8 08:03 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 12 Nov 2007 01:04:59 +0000 (11 17:04 -0800) | ||
| tree | 01155796459a196d41c9a755df66aaa31b0df008 | treesnapshot (tar.gz zip) |
| parent | 40e2524da9f9fb2806a66a694b9aee722ea3ef0a | commitdiff |
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>
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 | diffblobblamehistory | |
| t/t3403-rebase-skip.sh | diffblobblamehistory |