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

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On 2010.04.09 21:29:03 -0400, Jeff King wrote:
> 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
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]