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

Re: impure renames / history tracking

From
Llinux@horizon.com <linux@horizon.com>
Date
Mar 2, 2006, 22:24 UTC
Message-ID
<20060302222435.11534.qmail@science.horizon.com>
Show 5 quoted lines
>> Yes, but imo a poor one, as you're losing all the history.
>
> Well, not per se. You might keep the original 'detail' branch. It's a 
> terminal branch obviously, you can't pull master's changes to it once 
> the aggregate patch goes into master. But you can keep it around.

Actually, you can! That's what the "ours" merge stratgy is for! It creates a merge whose result is a verbatim copy of the first parent.

The intended use is for when you've cherry-picked or otherwise manually merged everything interesting from a branch and want to tie up the loose end so you can delete the branch name.

Message 1 of 1 in “Re: impure renames / history tracking”
  1. linux@horizon.comMar 2, 2006

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.