From: "Björn Steinbrink" <B.Steinbrink@gmx.de>
To: Jeff King <peff@peff.net>
Cc: Yury Polyanskiy <polyanskiy@gmail.com>, git@vger.kernel.org
Subject: Re: Why not show ORIG_HEAD in git-log --decorate?
Date: Sat, 10 Apr 2010 11:00:42 +0200 [thread overview]
Message-ID: <20100410090042.GA13109@atjola.homenet> (raw)
In-Reply-To: <20100410012903.GA32428@coredump.intra.peff.net>
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
next prev parent reply other threads:[~2010-04-10 9:00 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-04-09 16:07 Why not show ORIG_HEAD in git-log --decorate? Yury Polyanskiy
2010-04-10 1:29 ` Jeff King
2010-04-10 9:00 ` Björn Steinbrink [this message]
2010-04-10 9:04 ` Jeff King
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=20100410090042.GA13109@atjola.homenet \
--to=b.steinbrink@gmx.de \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
--cc=polyanskiy@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).