Santi BÃjar <santi@xxxxxxxxxxx> writes: > No, I'm not sure. In fact the documentation explicit says that they > are different. But I fail to see when it matters, and more > specifically (now that I've reread the docs), what is the point of > "merge-base A B C". See c5dc9a2 (git-merge-octopus: use (merge-base A (merge B C D E...)) for stepwise merge, 2008-07-27), not the patch but the explanation. > Just a data point, show-branch --merge-base is only used once in the > code, in git-pull.sh, but "git merge-base A B C" is not used (at least > using my grep). Your grep skill needs honing ;-) The variable MRC in git-merge-octopus is a space separated list of commit object names, split at $IFS when merge-base is called. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html