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 /wt-status.c | |
| parent | c4da6c0b76691c63e3f4aea3f1079b37ac0e6d98 (diff) | |
| parent | 5802f81b1438fdbfab340c4e752e2be457c4a065 (diff) | |
| download | git-edf141218e4e4ecca3a8ab0c8fa9eafe381b3838.tar.gz git-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 'wt-status.c')
0 files changed, 0 insertions, 0 deletions