From: Junio C Hamano <gitster@pobox.com>
To: "Santi Béjar" <santi@agolina.net>
Cc: Sverre Rabbelier <srabbelier@gmail.com>,
Jonathan Nieder <jrnieder@gmail.com>,
Git List <git@vger.kernel.org>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>
Subject: Re: BUG: git pull --rebase on detatched head prints a lot of usage warnings
Date: Fri, 03 Dec 2010 14:31:57 -0800 [thread overview]
Message-ID: <7vy686lc82.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <AANLkTimgk-jqyKD+ab=bHZLVH3F52WqCjr4v3chMY_Fv@mail.gmail.com> ("Santi Béjar"'s message of "Fri\, 3 Dec 2010 23\:16\:11 +0100")
Santi Béjar <santi@agolina.net> 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.
prev parent reply other threads:[~2010-12-03 22:32 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-03 18:38 BUG: git pull --rebase on detatched head prints a lot of usage warnings Sverre Rabbelier
2010-12-03 19:00 ` Jonathan Nieder
2010-12-03 19:05 ` Sverre Rabbelier
2010-12-03 20:23 ` Santi Béjar
2010-12-03 20:45 ` Sverre Rabbelier
2010-12-03 21:06 ` Junio C Hamano
2010-12-03 22:16 ` Santi Béjar
2010-12-03 22:31 ` Junio C Hamano [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vy686lc82.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=jrnieder@gmail.com \
--cc=santi@agolina.net \
--cc=srabbelier@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).