summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-tree.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2008-10-15 16:00:06 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-10-18 10:00:59 -0700
commitd1a43f2aa4bfb5aef29e9e1fe1fb9bb18c0e8b65 (patch)
treec248f1a5ea841d2ac72cfb6aa46b2370ce9b8460 /Documentation/git-merge-tree.txt
parentremote.c: correct the check for a leading '/' in a remote name (diff)
downloadtgif-d1a43f2aa4bfb5aef29e9e1fe1fb9bb18c0e8b65.tar.xz
reset --hard/read-tree --reset -u: remove unmerged new paths
When aborting a failed merge that has brought in a new path using "git reset --hard" or "git read-tree --reset -u", we used to first forget about the new path (via read_cache_unmerged) and then matched the working tree to what is recorded in the index, thus ending up leaving the new path in the work tree. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge-tree.txt')
0 files changed, 0 insertions, 0 deletions