"reset --merge": fix unmerged case
authorJunio C Hamano <gitster@pobox.com>
Fri, 1 Jan 2010 07:04:04 +0000 (23:04 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 4 Jan 2010 00:01:05 +0000 (16:01 -0800)
commite11d7b5...69704cd5ce39d053414d905bb203886b
tree1ce35ca...5aee4af20caeb895ebbd90a3ef4f824fcopy hash to clipboard (tree)
parentd0f379c...dcf7198d373b3c64444019bed2e24336copy hash to clipboard (diff)
Documentation/git-reset.txt
cache.h
read-cache.c
t/t7110-reset-merge.sh
unpack-trees.c