diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-04-17 20:31:10 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-04-18 02:14:19 +0200 |
| commit | b5d887f90692515a6e9c99e7683533d12df3ade2 (patch) | |
| tree | f377b585cd6f9bf6dc49a1fd90898269edc14d4f /t/t7602-merge-octopus-many.sh | |
| parent | builtin/merge.c: remove "remoteheads" global variable (diff) | |
| download | git-b5d887f90692515a6e9c99e7683533d12df3ade2.tar.xz git-b5d887f90692515a6e9c99e7683533d12df3ade2.zip | |
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>
Diffstat (limited to 't/t7602-merge-octopus-many.sh')
0 files changed, 0 insertions, 0 deletions