From: Jeff King <peff@peff.net>
To: Alex Riesen <raa.lkml@gmail.com>
Cc: Steven Grimm <koreth@midwinter.com>, git@vger.kernel.org
Subject: Re: git blame and cherry-picking
Date: Thu, 7 Aug 2008 14:22:56 -0400 [thread overview]
Message-ID: <20080807182256.GF11314@sigill.intra.peff.net> (raw)
In-Reply-To: <20080807060940.GA15405@blimp.local>
On Thu, Aug 07, 2008 at 08:09:40AM +0200, Alex Riesen wrote:
> Steven Grimm, Thu, Aug 07, 2008 00:18:33 +0200:
> > What, if any, is the approved way to get git blame to follow cherry-
> > picked changes?
>
> The can't be any: cherry-picks are just new commits. You just make the
> same changes at the new place in the history.
We used to say "cherry-picked from..." in the commit message, but I
don't think we do by default any longer. One could follow that link to
see the original change (if it still exists!).
You could potentially have git-blame incorporate that information
(again, if the referenced commit is even still available), but I'm not
sure exactly what difference it would make. I don't think you would want
to start blaming up the original commits line of parentage.
-Peff
next prev parent reply other threads:[~2008-08-07 18:24 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-08-06 22:18 git blame and cherry-picking Steven Grimm
2008-08-07 6:09 ` Alex Riesen
2008-08-07 18:22 ` Jeff King [this message]
2008-08-07 18:37 ` Steven Grimm
2008-08-07 18:49 ` Junio C Hamano
2008-08-07 18:49 ` Jeff King
2008-08-07 17:53 ` Avery Pennarun
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=20080807182256.GF11314@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=koreth@midwinter.com \
--cc=raa.lkml@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).