Junio C Hamano d5d1678b9c Merge branch 'bm/merge-base-octopus-dedup' ...

"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

2014-01-10 10:33:33 -08:00

5.9 KiB

Raw Blame History

View Raw