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

Re: merge smart enough to adapt to renames?

From
Caleb Cushing <xenoterracide@gmail.com>
Date
Feb 20, 2009, 02:17 UTC
Message-ID
<81bfc67a0902191817u11361d0bw1f2215a53e284f8f@mail.gmail.com>
In-Reply-To
<slrngprunn.hbo.sitaramc@sitaramc.homelinux.net>
> Not sure I understood this completely, but I've found it
> helps to make the rename/move as a separate commit, then
> start changing stuff.  In other words, do too many things in
> the same commit, and you could lose this coolness.

well I the problem is.. in a sense I need to unmerge 2 files that I once merged... they currently have the same name and are in the same place, and where I merge them from they'll continue to have that name (although they are different files with the same purpose) but I want them to have different names and spots in my tree/repo.

-- 
Caleb Cushing

http://xenoterracide.blogspot.com
Previous: Sitaram ChamartyNext: Rogan Dawes
Message 5 of 10 in “merge smart enough to adapt to renames?”
  1. Caleb CushingFeb 19, 2009
  2. Sitaram ChamartyFeb 19, 2009
  3. Caleb CushingFeb 19, 2009
  4. Sitaram ChamartyFeb 20, 2009
  5. Caleb CushingFeb 20, 2009
  6. Rogan DawesFeb 20, 2009
  7. Kris ShannonFeb 21, 2009
  8. Rogan DawesFeb 21, 2009
  9. Caleb CushingFeb 22, 2009
  10. Rogan DawesFeb 22, 2009

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.