From: Ingo Molnar Date: Mon, 23 Jun 2008 16:05:32 GMT Subject: Re: linux-x86-tip: pilot error? Message-ID: <20080623160532.GA10540@elte.hu> In-Reply-To: <20080623151257.GC20902@sigill.intra.peff.net> * Jeff King 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] 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