projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c4da6c0 5802f81)
Merge branch 'jc/merge-reduce-parents-early' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 3 May 2012 22:36:15 +0000 (15:36 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 3 May 2012 22:36:15 +0000 (15:36 -0700)
commitedf141218e4e4ecca3a8ab0c8fa9eafe381b3838
tree62ae891f75bed0b4cd5a2c3c4339b753cd7b3f71tree | snapshot
parentc4da6c0b76691c63e3f4aea3f1079b37ac0e6d98commit | diff
parent5802f81b1438fdbfab340c4e752e2be457c4a065commit | diff
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
builtin/merge.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.