From: Jeff King <peff@peff.net>
To: "Björn Steinbrink" <B.Steinbrink@gmx.de>
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 05:04:41 -0400 [thread overview]
Message-ID: <20100410090441.GA18772@coredump.intra.peff.net> (raw)
In-Reply-To: <20100410090042.GA13109@atjola.homenet>
On Sat, Apr 10, 2010 at 11:00:42AM +0200, Björn Steinbrink wrote:
> > 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.
Urgh, yes. Sorry, I was totally not thinking when I wrote that.
I never use ORIG_HEAD, as I always do a fetch + inspect + merge, rather
than pull. But I can't even figure out what thought process led me to
write what I did above.
Thanks for the correction.
-Peff
prev parent reply other threads:[~2010-04-10 9:05 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
2010-04-10 9:04 ` Jeff King [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=20100410090441.GA18772@coredump.intra.peff.net \
--to=peff@peff.net \
--cc=B.Steinbrink@gmx.de \
--cc=git@vger.kernel.org \
--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).