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

Merge after rename

From
PSPhil Susi <psusi@ubuntu.com>
Date
Jul 9, 2015, 20:44 UTC
Message-ID
<559EDD33.50906@ubuntu.com>

I'm trying to cherry pick an old change from an old branch onto the current master, and since the old change, the directory structure was altered and the modified files were moved. Instead of detecting the new location of the file and applying the changes to it, git is re-adding the old file at the old location in its entirety. How can I get it to correctly notice the rename and merge the changes in at the file's new location?

Next: Jacob Keller
Message 1 of 2 in “Merge after rename”
  1. Phil SusiJul 9, 2015
  2. Jacob KellerJul 10, 2015

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.