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

Re: [PATCH 0/5] Fix rebase with file move when diff.renames = copies

From
Jonathan Nieder <jrnieder@gmail.com>
Date
Jul 24, 2010, 21:59 UTC
Message-ID
<20100724215910.GA5780@burratino>
In-Reply-To
<624201.94995.qm@web30003.mail.mud.yahoo.com>
David D. Kilzer wrote:
> On Fri, July 23, 2010 at 10:01:03 AM, Jonathan Nieder wrote:
Show 5 quoted lines
>> Something like this series would fix both.  Please feel free to pick
>> it up and take it in whatever direction you like.
>
> Is this comment to me or Junio?  As a part-time contributor, I'm not sure what 
> my options are here.  :)
It is to the world at large, or more precisely, anyone who is interested.

I only meant that I am not planning to keep track of what happens to those patches in the future. Ideally someone else (maybe you ;-)) will take care of pinging if a patch gets forgotten or improving the patches if some obvious change suggests itself.

Thanks for the initial ping, by the way.
Previous: David D. Kilzer
Message 22 of 22 in “3-way merge with file move fails when diff.renames = copies”
  1. 3-way merge with file move fails when diff.renames = copiesDavid D. Kilzer, Nov 10, 2008
  2. Johannes SchindelinNov 10, 2008
  3. Fix 3-way merge with file move when diff.renames = copiesDavid D. Kilzer, Nov 10, 2008
  4. Junio C HamanoNov 10, 2008
  5. David D. KilzerNov 11, 2008
  6. Junio C HamanoNov 11, 2008
  7. Fix rebase with file move when diff.renames = copiesDavid D. Kilzer, Jul 21, 2010
  8. Junio C HamanoJul 21, 2010
  9. David D. KilzerJul 22, 2010
  10. Jonathan NiederJul 22, 2010
  11. David D. KilzerJul 22, 2010
  12. 0/5 Fix rebase with file move when diff.renames = copiesJonathan Nieder, Jul 23, 2010
  13. 1/5 t4150 (am): style tweaksJonathan Nieder, Jul 23, 2010
  14. 2/5 t4150 (am): futureproof against failing testsJonathan Nieder, Jul 23, 2010
  15. 3/5 Teach "apply --index-info" to handle rename patchesJonathan Nieder, Jul 23, 2010
  16. 4/5 t3400 (rebase): whitespace cleanupJonathan Nieder, Jul 23, 2010
  17. 5/5 rebase: protect against diff.renames configurationJonathan Nieder, Jul 23, 2010
  18. Sverre RabbelierJul 23, 2010
  19. Junio C HamanoJul 23, 2010
  20. Sverre RabbelierJul 23, 2010
  21. David D. KilzerJul 23, 2010
  22. Jonathan NiederJul 24, 2010

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.