| commit | 2cd861672e1021012f40597b9b68cc3a9af62e10 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 13 Feb 2014 21:38:59 +0000 (13 13:38 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 13 Feb 2014 21:38:59 +0000 (13 13:38 -0800) | ||
| tree | 5638bb031b32cb06df4ec87ff8066c2ca48cd7c9 | treesnapshot (tar.gz zip) |
| parent | 5032098614b6f68258d1f5d13615b9dcbf25f040 | commitdiff |
| parent | 8f29299136c2f11730d876cd62637a9e37d4c388 | commitdiff |
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
"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
| builtin/merge-base.c | diff1 | diff2 | blobhistory |