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

Re: Rename edge case...

From
Johannes Sixt <j.sixt@viscovery.net>
Date
Nov 9, 2012, 13:17 UTC
Message-ID
<509D0252.8070901@viscovery.net>
In-Reply-To
<CAEBDL5WeQEWdyaJuuNbnnQbbsLYv8NO1ZSj3eHHpjW+ToS9X1A@mail.gmail.com>
Am 11/9/2012 11:25, schrieb John Szakmeister:
Show 9 quoted lines
> On Fri, Nov 9, 2012 at 4:27 AM, Tomas Carnecky <tomas.carnecky@gmail.com> wrote:
> [snip]
>> When merging two branches, git only looks at the tips. It doesn't inspect
>> their histories to see how the files were moved around. So i doesn't matter
>> whether you rename the files in a single commit or multiple commits. The
>> resulting tree is always the same.
> 
> I guess I figured that when I saw the final result, but didn't know if
> there was a way to coax Git into doing a better job here.

If the renames are split in two commits, you can merge the first, and then the second on top of the result.

-- Hannes
Previous: Nguyen Thai Ngoc DuyNext: Jeff King
Message 5 of 7 in “Rename edge case...”
  1. John SzakmeisterNov 9, 2012
  2. Tomas CarneckyNov 9, 2012
  3. John SzakmeisterNov 9, 2012
  4. Nguyen Thai Ngoc DuyNov 9, 2012
  5. Johannes SixtNov 9, 2012
  6. Jeff KingNov 9, 2012
  7. John SzakmeisterNov 10, 2012

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.