From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 13 Feb 2014 21:38:59 +0000 (-0800)
Subject: Merge branch 'bm/merge-base-octopus-dedup' into maint
X-Git-Tag: v1.8.5.5~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2cd861672e1021012f40597b9b68cc3a9af62e10;p=thirdparty%2Fgit.git

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
---

2cd861672e1021012f40597b9b68cc3a9af62e10