Thread (1 message) 1 message, 1 author, 2016-06-15

Re: BUG: git pull --rebase on detatched head prints a lot of usage warnings

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:50:10

Santi Béjar [off-list ref] 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.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help