Re: Why not show ORIG_HEAD in git-log --decorate?

From: Björn Steinbrink <b.steinbrink@gmx.de>
Date: Apr 10, 2010, 09:00 UTC
Message-ID: <20100410090042.GA13109@atjola.homenet>
In-Reply-To: <20100410012903.GA32428@coredump.intra.peff.net>

On 2010.04.09 21:29:03 -0400, Jeff King wrote:

Show 13 quoted lines

> On Fri, Apr 09, 2010 at 12:07:00PM -0400, Yury Polyanskiy wrote:
> 
> > It would be very convenient if after git-pull I could see the new
> > merged-in commits in the git-log. The simplest solution for this is to
> > simply mark ORIG_HEAD in the output of git-log --decorate (and ideally
> > also in gitk).
> 
> I think most people do something like:
> 
>   gitk HEAD^..ORIG_HEAD
> 
> To see everything in ORIG_HEAD that isn't in HEAD^ (the first parent of
> HEAD, or what you had just before the pull).

I guess you meant to say "gitk ORIG_HEAD.." there. ORIG_HEAD is already the pre-pull state. So if the merge actually created a merge commit, then HEAD^ == ORIG_HEAD, and if it was a fast-forward, then ORIG_HEAD is either the same as HEAD^ or one of its ancestors. In either case, HEAD^..ORIG_HEAD will be empty.

Björn