From: Junio C Hamano 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: https://git.lorimer.id.au/gitweb.git/diff_plain/2cd861672e1021012f40597b9b68cc3a9af62e10 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