| commit | b5d887f90692515a6e9c99e7683533d12df3ade2 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 17 Apr 2012 18:31:10 +0000 (17 11:31 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 18 Apr 2012 00:14:19 +0000 (17 17:14 -0700) | ||
| tree | f377b585cd6f9bf6dc49a1fd90898269edc14d4f | treesnapshot (tar.gz zip) |
| parent | 4c57bd27402353f135250af91d1cc2646db73df0 | commitdiff |
builtin/merge.c: collect other parents early
Move the code around to populate remoteheads list early in the process
before any decision regarding twohead vs octopus and fast-forwardness is
made.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Move the code around to populate remoteheads list early in the process
before any decision regarding twohead vs octopus and fast-forwardness is
made.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin/merge.c | diffblobblamehistory |