projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: ec014ea) | patch
checkout -m: no need to insist on having all 3 stages
authorJunio C Hamano <gitster@pobox.com>
Mon, 5 Dec 2011 18:58:23 +0000 (10:58 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 6 Dec 2011 22:17:01 +0000 (14:17 -0800)
commitfbbccd0a10f314d9cce4427a4135efd051610880
tree6ec4f0f7268dedc7bfd417102e8f372599122e67tree | snapshot
parentec014eac0e9e6f30cbbca616090fa2ecf74797e7commit | diff
checkout -m: no need to insist on having all 3 stages

The content level merge machinery ll_merge() is prepared to merge
correctly in "both sides added differently" case by using an empty blob as
if it were the common ancestor. "checkout -m" could do the same, but didn't
bother supporting it and instead insisted on having all three stages.

Reported-by: Pete Harlan
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/checkout.c diff | blob | history
Git—the stupid content tracker