diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-05-03 15:36:15 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-05-03 15:36:15 -0700 |
| commit | edf141218e4e4ecca3a8ab0c8fa9eafe381b3838 (patch) | |
| tree | 62ae891f75bed0b4cd5a2c3c4339b753cd7b3f71 /t/t9808-git-p4-chdir.sh | |
| parent | Merge branch 'cb/cherry-pick-rev-path-confusion' into maint (diff) | |
| parent | fmt-merge-msg: discard needless merge parents (diff) | |
| download | tgif-edf141218e4e4ecca3a8ab0c8fa9eafe381b3838.tar.xz | |
Merge branch 'jc/merge-reduce-parents-early' into maint
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/t9808-git-p4-chdir.sh')
0 files changed, 0 insertions, 0 deletions