| commit | 283097e9ed751b866c9d405d17c21a10bfb9465f | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 27 Apr 2012 20:59:20 +0000 (27 13:59 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 27 Apr 2012 20:59:20 +0000 (27 13:59 -0700) | ||
| tree | e20c55dabe9fc286dc41cb78434507f21c821e4d | treesnapshot (tar.gz zip) |
| parent | 7b864abe0b0e9cf090d890195cdbdec2edf328a9 | commitdiff |
| parent | 5802f81b1438fdbfab340c4e752e2be457c4a065 | commitdiff |
Merge branch 'jc/merge-reduce-parents-early'
Octopus merge strategy did not reduce heads that are recorded in the
final commit correctly.
By Junio C Hamano (4) and Michał Kiedrowicz (1)
* jc/merge-reduce-parents-early:
fmt-merge-msg: discard needless merge parents
builtin/merge.c: reduce parents early
builtin/merge.c: collect other parents early
builtin/merge.c: remove "remoteheads" global variable
merge tests: octopus with redundant parents
Octopus merge strategy did not reduce heads that are recorded in the
final commit correctly.
By Junio C Hamano (4) and Michał Kiedrowicz (1)
* jc/merge-reduce-parents-early:
fmt-merge-msg: discard needless merge parents
builtin/merge.c: reduce parents early
builtin/merge.c: collect other parents early
builtin/merge.c: remove "remoteheads" global variable
merge tests: octopus with redundant parents
| builtin/fmt-merge-msg.c | diff1 | diff2 | blobhistory |
| builtin/merge.c | diff1 | diff2 | blobhistory |
| t/t7602-merge-octopus-many.sh | diff1 | diff2 | blobhistory |