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

Re: git log --follow doesn't follow a rename over a merge

From
James Blackburn <jamesblackburn@gmail.com>
Date
Jun 16, 2011, 17:01 UTC
Message-ID
<BANLkTi=4S08h=uMV5oo7S9qpruMot2kVfg@mail.gmail.com>
In-Reply-To
<BANLkTik1-UvEXqzgdXwcK3x6_o8fDiwB7g@mail.gmail.com>

I see a lot of this has been discussed before... but just to add that Jeff's blame-log.sh: http://git.661346.n2.nabble.com/alternate-log-follow-idea-td1385917.html seems to work and show the full history of the file past the rename+merge!

I was also interested in whether there's a better way of re-connecting history than grafting one repository's history into the commit which made it visible in another? AFAICS the graft is no different to a merge commit which contains a rename in the merged node, so I'm guessing this is a reasonable thing to do?

Cheers, James

Previous: James BlackburnNext: Jeff King
Message 4 of 14 in “git log --follow doesn't follow a rename over a merge”
  1. James BlackburnJun 15, 2011
  2. Jakub NarebskiJun 16, 2011
  3. James BlackburnJun 16, 2011
  4. James BlackburnJun 16, 2011
  5. Jeff KingJun 16, 2011
  6. Jeff KingJun 16, 2011
  7. Junio C HamanoJun 16, 2011
  8. Jeff KingJun 16, 2011
  9. James BlackburnJun 16, 2011
  10. James BlackburnJun 16, 2011
  11. Junio C HamanoJun 16, 2011
  12. James BlackburnJun 16, 2011
  13. James BlackburnJun 16, 2011
  14. James BlackburnJun 16, 2011

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.