tree 5638bb031b32cb06df4ec87ff8066c2ca48cd7c9
parent 5032098614b6f68258d1f5d13615b9dcbf25f040
parent 8f29299136c2f11730d876cd62637a9e37d4c388
author Junio C Hamano <gitster@pobox.com> 1392327539 -0800
committer Junio C Hamano <gitster@pobox.com> 1392327539 -0800

Merge branch 'bm/merge-base-octopus-dedup' into maint

"git merge-base --octopus" used to leave cleaning up suboptimal
result to the caller, but now it does the clean-up itself.

* bm/merge-base-octopus-dedup:
  merge-base --octopus: reduce the result from get_octopus_merge_bases()
  merge-base: separate "--independent" codepath into its own helper