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

Re: [PATCH 08/11] Improve section "Merging multiple trees"

From
Junio C Hamano <gitster@pobox.com>
Date
Aug 27, 2013, 19:15 UTC
Message-ID
<xmqq7gf7c5ci.fsf@gitster.dls.corp.google.com>
In-Reply-To
<1931551541.34581.1377626589383.JavaMail.ngmail@webmail19.arcor-online.net>
Thomas Ackermann <th.acker@arcor.de> writes:
Show 6 quoted lines
> Remove unnecessary quoting.
> Simplify description of three-way merge.
>
> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
> Signed-off-by: Thomas Ackermann <th.acker@arcor.de>
> ---

The update is good, but I wonder if this belongs to "User's manual" these days.

Perhaps we should start thinking about ripping the "how to use plumbing" out of the end-user manual and moving them to the core-tutorial where this kind of thing is more suited for.

Previous: Thomas AckermannNext: Thomas Ackermann
Message 23 of 28 in “Modernize user-manual”
  1. 0/11 Modernize user-manualThomas Ackermann, Aug 27, 2013
  2. 01/11 Call it "Git User Manual" and remove reference to very old Git versionThomas Ackermann, Aug 27, 2013
  3. Junio C HamanoAug 27, 2013
  4. Lars Gullik BjønnesAug 27, 2013
  5. Junio C HamanoAug 29, 2013
  6. 02/11 Use current "detached HEAD" messageThomas Ackermann, Aug 27, 2013
  7. Junio C HamanoAug 29, 2013
  8. 03/11 Use current output for "git repack"Thomas Ackermann, Aug 27, 2013
  9. Junio C HamanoAug 29, 2013
  10. 04/11 Use "git merge" instead of "git pull ."Thomas Ackermann, Aug 27, 2013
  11. Junio C HamanoAug 27, 2013
  12. Jonathan NiederAug 27, 2013
  13. Junio C HamanoAug 27, 2013
  14. 05/11 Fix some typos and improve wordingThomas Ackermann, Aug 27, 2013
  15. Junio C HamanoAug 27, 2013
  16. Junio C HamanoAug 29, 2013
  17. 06/11 Simplify "How to make a commit"Thomas Ackermann, Aug 27, 2013
  18. Junio C HamanoAug 27, 2013
  19. Junio C HamanoAug 29, 2013
  20. 07/11 Improve section "Manipulating branches"Thomas Ackermann, Aug 27, 2013
  21. Junio C HamanoAug 27, 2013
  22. 08/11 Improve section "Merging multiple trees"Thomas Ackermann, Aug 27, 2013
  23. Junio C HamanoAug 27, 2013
  24. 09/11 Remove unnecessary historical note from "Object storage format"Thomas Ackermann, Aug 27, 2013
  25. Junio C HamanoAug 27, 2013
  26. 10/11 Remove irrelevant reference from "Tying it all together"Thomas Ackermann, Aug 27, 2013
  27. 11/11 "git prune" is safeThomas Ackermann, Aug 27, 2013
  28. Junio C HamanoAug 27, 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.