summaryrefslogtreecommitdiff
path: root/Documentation/RelNotes-1.5.0.3.txt
diff options
context:
space:
mode:
authorLibravatar Mike Hommey <mh@glandium.org>2007-11-08 08:03:06 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2007-11-11 17:04:59 -0800
commitfb6e4e1f3f048898677f3cf177bfcaf60123bd5c (patch)
tree01155796459a196d41c9a755df66aaa31b0df008 /Documentation/RelNotes-1.5.0.3.txt
parentMerge branch 'js/upload-pack' (diff)
downloadtgif-fb6e4e1f3f048898677f3cf177bfcaf60123bd5c.tar.xz
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 'Documentation/RelNotes-1.5.0.3.txt')
0 files changed, 0 insertions, 0 deletions