From: Ingo Molnar <mingo@elte.hu>
To: Jeff King <peff@peff.net>
Cc: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>,
Mikael Magnusson <mikachu@gmail.com>,
git@vger.kernel.org, Thomas Gleixner <tglx@linutronix.de>
Subject: Re: linux-x86-tip: pilot error?
Date: Mon, 23 Jun 2008 18:05:32 +0200 [thread overview]
Message-ID: <20080623160532.GA10540@elte.hu> (raw)
In-Reply-To: <20080623151257.GC20902@sigill.intra.peff.net>
* Jeff King <peff@peff.net> wrote:
> On Mon, Jun 23, 2008 at 09:14:41AM +0200, Ingo Molnar wrote:
>
> > Is there a Git way of finding the common ancestor of a topic branch,
> > when compared to upstream?
>
> Try:
>
> git merge-base topic upstream
small (and stupid) feature suggestion for git-merge-base.
i was working on a topic branch when i wanted to figure out its base to
linus/master, and i typed:
~/tip> git-merge-base linus
usage: git-merge-base [--all] <commit-id> <commit-id>
it might make sense to implicitly use the current 'HEAD' as a second,
default parameter to git-merge-base. (unless i'm missing some particular
detail about why that would be a bad idea)
Ingo
prev parent reply other threads:[~2008-06-23 16:07 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-06-22 12:36 linux-x86-tip: pilot error? Paul E. McKenney
2008-06-22 12:48 ` Mikael Magnusson
2008-06-22 13:21 ` Paul E. McKenney
2008-06-22 21:11 ` Mikael Magnusson
2008-06-22 21:42 ` Björn Steinbrink
2008-06-22 22:21 ` Paul E. McKenney
2008-06-23 7:14 ` Ingo Molnar
2008-06-23 9:57 ` Paul E. McKenney
2008-06-23 10:24 ` Ingo Molnar
2008-06-23 11:11 ` Paul E. McKenney
2008-06-23 11:22 ` Ingo Molnar
2008-06-23 16:14 ` Daniel Barkalow
2008-06-23 15:12 ` Jeff King
2008-06-23 15:31 ` Ingo Molnar
2008-06-23 16:05 ` Ingo Molnar [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=20080623160532.GA10540@elte.hu \
--to=mingo@elte.hu \
--cc=git@vger.kernel.org \
--cc=mikachu@gmail.com \
--cc=paulmck@linux.vnet.ibm.com \
--cc=peff@peff.net \
--cc=tglx@linutronix.de \
/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).