diff options
| author |  Junio C Hamano <junkio@cox.net> | 2007-01-23 16:51:22 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-01-23 16:58:13 -0800 |
| commit | d7ebd53d371153f7a61c0fe9f384c9662b751bf6 (patch) | |
| tree | 08cd9a0e082f05c59109c3cbf029bd94488a1c2d /git-merge-resolve.sh | |
| parent | reflog gc: a tag that does not point at a commit is not a crime. (diff) | |
| download | tgif-d7ebd53d371153f7a61c0fe9f384c9662b751bf6.tar.xz | |
git-checkout -m: fix merge case
Commit c1a4278e switched the "merging checkout" implementation
from 3-way read-tree to merge-recursive, but forgot that
merge-recursive will signal an unmerged state with its own exit
status code. This prevented the clean-up phase (paths cleanly
merged should not be updated in the index) from running.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions