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

Re: correct git merge behavior or corner case?

From
Jeff King <peff@peff.net>
Date
Apr 21, 2009, 18:05 UTC
Message-ID
<20090421180529.GA7583@coredump.intra.peff.net>
In-Reply-To
<20090421195434.3a01676d@gmail.com>
On Tue, Apr 21, 2009 at 07:54:34PM +0200, Michał Kiedrowicz wrote:
Show 12 quoted lines
> And here is a test case:
> [...]
> +	echo "hello" > date &&
> +	git add date &&
> +	git commit -m initial &&
> +
> +	git branch parallel &&
> +
> +	echo "hello" > LICENSE &&
> +	cp LICENSE LICENSE-copy &&
> +	git add LICENSE &&
> +	git commit -m LICENSE &&

I thought the point was about _empty_ renames. This is a small but non-zero rename.

-Peff
Previous: Michał KiedrowiczNext: Michał Kiedrowicz
Message 15 of 17 in “correct git merge behavior or corner case?”
  1. Tuncer AyazApr 19, 2009
  2. Shawn O. PearceApr 20, 2009
  3. Johannes SchindelinApr 20, 2009
  4. Anders MelchiorsenApr 20, 2009
  5. Jeff KingApr 21, 2009
  6. Jeff KingApr 21, 2009
  7. Junio C HamanoApr 21, 2009
  8. Sverre RabbelierApr 21, 2009
  9. Johannes SchindelinApr 21, 2009
  10. Sverre RabbelierApr 21, 2009
  11. Johannes SchindelinApr 21, 2009
  12. Johannes SchindelinApr 21, 2009
  13. Michał KiedrowiczApr 21, 2009
  14. Michał KiedrowiczApr 21, 2009
  15. Jeff KingApr 21, 2009
  16. Michał KiedrowiczApr 21, 2009
  17. Jeff KingApr 21, 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.