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

Re: git merge questions

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Dec 16, 2005, 23:58 UTC
Message-ID
<Pine.LNX.4.63.0512170056380.11000@wbgn013.biozentrum.uni-wuerzburg.de>
In-Reply-To
<7voe3gd6ul.fsf@assigned-by-dhcp.cox.net>
Hi,

just a thought: maybe in this case -- git fails to recognize a rename -- Pasky's idea would have some merit. You could then provide git with some extra information a la .git/info/grafts: "Even if you, git, do not believe it: this file *was* renamed from blah to blop".

Ciao, Dscho

Previous: Junio C HamanoNext: Junio C Hamano
Message 7 of 9 in “git merge questions”
  1. Don ZickusDec 16, 2005
  2. Junio C HamanoDec 16, 2005
  3. Don ZickusDec 16, 2005
  4. Junio C HamanoDec 16, 2005
  5. Don ZickusDec 16, 2005
  6. Junio C HamanoDec 16, 2005
  7. Johannes SchindelinDec 16, 2005
  8. Junio C HamanoDec 17, 2005
  9. Junio C HamanoDec 17, 2005

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.