git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 1846e9e)
merge-base --octopus to mimic show-branch --merge-base
authorJonathan Nieder <redacted>
Tue, 17 Aug 2010 07:01:15 +0000 (02:01 -0500)
committerJunio C Hamano <redacted>
Wed, 18 Aug 2010 21:02:03 +0000 (14:02 -0700)
commitaa8f98c1bfcf162e0bd23d20c34857940f2c2256
tree7defce780500efc5e152b080e67143e22255829etree | snapshot
parent1846e9edf6b9c8b8e84b96eab8753a1420b6b28dcommit | diff
merge-base --octopus to mimic show-branch --merge-base

While show-branch --merge-base does not support more than MAX_REVS
revs, git supports more with a different algorithm
(v1.6.0-rc0~51^2~13, Introduce get_octopus_merge_bases() in commit.c,
2008-06-27).  Expose that functionality.

This should help scripts to catch up with builtin merge in supporting
dodecapus.

Signed-off-by: Jonathan Nieder <redacted>
Signed-off-by: Junio C Hamano <redacted>
Documentation/git-merge-base.txt diff | blob | history
builtin/merge-base.c diff | blob | history
t/t6010-merge-base.sh diff | blob | history
git clone https://git.99rst.org/PROJECT