diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-04-27 13:59:20 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-04-27 13:59:20 -0700 |
| commit | 283097e9ed751b866c9d405d17c21a10bfb9465f (patch) | |
| tree | e20c55dabe9fc286dc41cb78434507f21c821e4d /t/t5522-pull-symlink.sh | |
| parent | Merge branch 'js/fast-import-test-9300' (diff) | |
| parent | fmt-merge-msg: discard needless merge parents (diff) | |
| download | tgif-283097e9ed751b866c9d405d17c21a10bfb9465f.tar.xz | |
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 't/t5522-pull-symlink.sh')
0 files changed, 0 insertions, 0 deletions