My Various Git Projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5032098 8f29299)
Merge branch 'bm/merge-base-octopus-dedup' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 13 Feb 2014 21:38:59 +0000 (13:38 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 13 Feb 2014 21:38:59 +0000 (13:38 -0800)
commit2cd861672e1021012f40597b9b68cc3a9af62e10
tree5638bb031b32cb06df4ec87ff8066c2ca48cd7c9tree | snapshot
parent5032098614b6f68258d1f5d13615b9dcbf25f040commit | diff
parent8f29299136c2f11730d876cd62637a9e37d4c388commit | diff
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
builtin/merge-base.c diff1 | diff2 | blob | history
The core git plumbing