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

Re: Re: [PATCH 09/13] Improve section "Merge multiple trees"

From
Jonathan Nieder <jrnieder@gmail.com>
Date
Aug 25, 2013, 20:10 UTC
Message-ID
<20130825201013.GB2752@elie.Belkin>
In-Reply-To
<2127851205.483802.1377432379441.JavaMail.ngmail@webmail16.arcor-online.net>
Thomas Ackermann wrote:
>> Maybe the intent is
>>
>> 	Git can help you perform a three-way merge, which can in turn be
[...]
> If you don't mind I will use your text
No problem.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Previous: Thomas AckermannNext: Thomas Ackermann
Message 32 of 44 in “Modernize user-manual”
  1. 0/13 Modernize user-manualThomas Ackermann, Aug 24, 2013
  2. 01/13 Call it "Git User Manual" and remove reference to very old Git versionThomas Ackermann, Aug 24, 2013
  3. Jonathan NiederAug 25, 2013
  4. Junio C HamanoAug 25, 2013
  5. 02/13 Use current "detached HEAD" messageThomas Ackermann, Aug 24, 2013
  6. Jonathan NiederAug 25, 2013
  7. Aw: Re: [PATCH 02/13] Use current "detached HEAD" messageThomas Ackermann, Aug 25, 2013
  8. 03/13 Use current output for "git repack"Thomas Ackermann, Aug 24, 2013
  9. Jonathan NiederAug 25, 2013
  10. Aw: Re: [PATCH 03/13] Use current output for "git repack"Thomas Ackermann, Aug 25, 2013
  11. 04/13 Use "git merge" instead of "git pull ."Thomas Ackermann, Aug 24, 2013
  12. Junio C HamanoAug 25, 2013
  13. Jonathan NiederAug 25, 2013
  14. Martin von ZweigbergkAug 25, 2013
  15. 05/13 Fix some typosThomas Ackermann, Aug 24, 2013
  16. Jonathan NiederAug 25, 2013
  17. Aw: Re: [PATCH 05/13] Fix some typosThomas Ackermann, Aug 25, 2013
  18. 06/13 Simplify "How to make a commit"Thomas Ackermann, Aug 24, 2013
  19. Junio C HamanoAug 25, 2013
  20. Jonathan NiederAug 25, 2013
  21. Aw: Re: [PATCH 06/13] Simplify "How to make a commit"Thomas Ackermann, Aug 25, 2013
  22. 07/13 Improve description in "How to merge"Thomas Ackermann, Aug 24, 2013
  23. Junio C HamanoAug 25, 2013
  24. Jonathan NiederAug 25, 2013
  25. Aw: Re: [PATCH 07/13] Improve description in "How to merge"Thomas Ackermann, Aug 25, 2013
  26. 08/13 Improve section "Manipulating branches"Thomas Ackermann, Aug 24, 2013
  27. Junio C HamanoAug 25, 2013
  28. Aw: Re: [PATCH 08/13] Improve section "Manipulating branches"Thomas Ackermann, Aug 25, 2013
  29. 09/13 Improve section "Merge multiple trees"Thomas Ackermann, Aug 24, 2013
  30. Jonathan NiederAug 25, 2013
  31. Aw: Re: [PATCH 09/13] Improve section "Merge multiple trees"Thomas Ackermann, Aug 25, 2013
  32. Jonathan NiederAug 25, 2013
  33. 10/13 Remove unnecessary historical note from "Object storage format"Thomas Ackermann, Aug 24, 2013
  34. Junio C HamanoAug 25, 2013
  35. 11/13 Remove obscure reference from "Examples"Thomas Ackermann, Aug 24, 2013
  36. Junio C HamanoAug 25, 2013
  37. Jonathan NiederAug 25, 2013
  38. Aw: Re: [PATCH 11/13] Remove obscure reference from "Examples"Thomas Ackermann, Aug 25, 2013
  39. 12/13 Remove irrelevant reference from "Tying it all together"Thomas Ackermann, Aug 24, 2013
  40. Junio C HamanoAug 25, 2013
  41. Jon LoeligerAug 26, 2013
  42. 13/13 "git prune" is safe nowThomas Ackermann, Aug 24, 2013
  43. Junio C HamanoAug 25, 2013
  44. Philip OakleyAug 24, 2013

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.