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

merge-recursive, was Re: What's in git.git

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Oct 26, 2006, 09:18 UTC
Message-ID
<Pine.LNX.4.63.0610261114520.3286@wbgn013.biozentrum.uni-wuerzburg.de>
In-Reply-To
<7vk62npipb.fsf@assigned-by-dhcp.cox.net>
Hi,
On Thu, 26 Oct 2006, Junio C Hamano wrote:
>   We'd still need more work on merge-recursive to fix the
>   overcautious "working file will be overwritten by merge" --
>   this is really needed for usability.

I am sorry, but I do not have the time to wrap my head around this for at least another week. It seems to be a complicated problem (not the fix, mind you, but the side effects you have to think of!), and I stupidly started to play with shallow clones when I knew I had no time already.

BTW what happened to the builtin shortlog? It is the last Perl script I use regularly... (should make people happy who are stuck with Activision Perl...)

Ciao, Dscho

Previous: Jakub NarebskiNext: Jakub Narebski
Message 6 of 26 in “What's in git.git”
  1. Junio C HamanoOct 26, 2006
  2. Jakub NarebskiOct 26, 2006
  3. Junio C HamanoOct 26, 2006
  4. Petr BaudisOct 26, 2006
  5. Jakub NarebskiOct 26, 2006
  6. merge-recursive, was Re: What's in git.gitJohannes Schindelin, Oct 26, 2006
  7. Jakub NarebskiOct 26, 2006
  8. Junio C HamanoOct 26, 2006
  9. Jakub NarebskiOct 26, 2006
  10. Nicolas PitreOct 26, 2006
  11. git-shortlog mailmapPetr Baudis, Oct 26, 2006
  12. Jakub NarebskiOct 26, 2006
  13. Andreas EricssonOct 26, 2006
  14. Jakub NarebskiOct 26, 2006
  15. Johannes SchindelinOct 26, 2006
  16. Petr BaudisOct 26, 2006
  17. Junio C HamanoOct 26, 2006
  18. Junio C HamanoOct 26, 2006
  19. Johannes SchindelinOct 26, 2006
  20. shortlog, was Re: merge-recursive, was Re: What's in git.gitAndreas Ericsson, Oct 26, 2006
  21. Nicolas PitreOct 26, 2006
  22. Andreas EricssonOct 26, 2006
  23. Jakub NarebskiOct 26, 2006
  24. Petr BaudisOct 27, 2006
  25. Petr BaudisOct 26, 2006
  26. Andy WhitcroftOct 26, 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.