diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-04-27 20:59:20 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-04-27 20:59:20 (GMT) |
| commit | 283097e9ed751b866c9d405d17c21a10bfb9465f (patch) | |
| tree | e20c55dabe9fc286dc41cb78434507f21c821e4d /upload-pack.c | |
| parent | 7b864abe0b0e9cf090d890195cdbdec2edf328a9 (diff) | |
| parent | 5802f81b1438fdbfab340c4e752e2be457c4a065 (diff) | |
| download | git-283097e9ed751b866c9d405d17c21a10bfb9465f.zip git-283097e9ed751b866c9d405d17c21a10bfb9465f.tar.gz git-283097e9ed751b866c9d405d17c21a10bfb9465f.tar.bz2 | |
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
Diffstat (limited to 'upload-pack.c')
0 files changed, 0 insertions, 0 deletions