git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: git blame and cherry-picking

From
Jeff King <peff@peff.net>
Date
Aug 7, 2008, 18:22 UTC
Message-ID
<20080807182256.GF11314@sigill.intra.peff.net>
In-Reply-To
<20080807060940.GA15405@blimp.local>
On Thu, Aug 07, 2008 at 08:09:40AM +0200, Alex Riesen wrote:
Show 6 quoted lines
> 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
Previous: Alex RiesenNext: Steven Grimm
Message 3 of 7 in “git blame and cherry-picking”
  1. Steven GrimmAug 6, 2008
  2. Alex RiesenAug 7, 2008
  3. Jeff KingAug 7, 2008
  4. Steven GrimmAug 7, 2008
  5. Junio C HamanoAug 7, 2008
  6. Jeff KingAug 7, 2008
  7. Avery PennarunAug 7, 2008

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.