From: "Avery Pennarun" <apenwarr@gmail.com>
To: "Steven Grimm" <koreth@midwinter.com>
Cc: "Git Users List" <git@vger.kernel.org>
Subject: Re: git blame and cherry-picking
Date: Thu, 7 Aug 2008 13:53:26 -0400 [thread overview]
Message-ID: <32541b130808071053g5fd0ce4u24d28263f38e0207@mail.gmail.com> (raw)
In-Reply-To: <91A979F0-1329-4CA6-AADC-6CF55872B57A@midwinter.com>
On 8/6/08, Steven Grimm <koreth@midwinter.com> wrote:
> What, if any, is the approved way to get git blame to follow cherry-picked
> changes? Right now blame is good about showing you the actual responsible
> revision and author in the case of merges, but if you cherry-pick a change
> with "-n" (to test before committing), the modifications are attributed to
> the person who did the cherry-pick instead of the cherry-picked revision's
> author. Even without the "-n" option, the changes are attributed to the
> cherry-pick *revision* instead of the original one.
It sounds like you at least want to avoid using "-n", if it really
does lose author information that way. If the patch doesn't work, you
can always "git commit --amend" or "git reset --hard HEAD^".
I don't think tracing through to the original revision is useful
anyway; nothing you'd find through the original commit would be
relevant to git blame, AFAICS, since none of those other patches were
applied to the branch you're looking at.
Have fun,
Avery
prev parent reply other threads:[~2008-08-07 17:54 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
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 [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=32541b130808071053g5fd0ce4u24d28263f38e0207@mail.gmail.com \
--to=apenwarr@gmail.com \
--cc=git@vger.kernel.org \
--cc=koreth@midwinter.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).