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

Re: blame follows renames, but log doesn't

From
Martin Langhoff <martin.langhoff@gmail.com>
Date
Jun 19, 2007, 08:31 UTC
Message-ID
<46a038f90706190131ub087df0pd7814b477c2a3b40@mail.gmail.com>
In-Reply-To
<20070619071916.GC9177@thunk.org>
On 6/19/07, Theodore Tso <tytso@mit.edu> wrote:
> Actually, the bigger missing gap is merges.  Suppose in the
> development branch, you rename a whole bunch of files.  (For example,
> foo_super.c got moved to foo/super.c, foo_inode.c got moved to
> foo/inode.c, etc.)

I thought that the "recursive" strategy covered this - though I don't work on a tree that merges across branches with renames, so my experience is _very_ limited.

>From Documentation/merge-strategies.txt:
  Additionally this can detect and handle merges involving
  renames.  This is the default merge strategy when
  pulling or merging one branch.
cheers
m
Previous: Theodore TsoNext: Junio C Hamano
Message 4 of 10 in “blame follows renames, but log doesn't”
  1. Martin LanghoffJun 19, 2007
  2. Sam VilainJun 19, 2007
  3. Theodore TsoJun 19, 2007
  4. Martin LanghoffJun 19, 2007
  5. Junio C HamanoJun 19, 2007
  6. Steven GrimmJun 19, 2007
  7. Directory renames (was Re: blame follows renames, but log doesn't)Steven Grimm, Jun 19, 2007
  8. Sam VilainJun 20, 2007
  9. Steven GrimmJun 20, 2007
  10. Jakub NarebskiJun 20, 2007

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.