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

[PATCH 0/5] Document 'AUTO_MERGE' and more special refs

From
Philippe Blain via GitGitGadget <gitgitgadget@gmail.com>
Date
Apr 14, 2023, 17:58 UTC
Message-ID
<pull.1515.git.1681495119.gitgitgadget@gmail.com>

This series adds documentation (and completion!) for AUTO_MERGE. In doing so I noticed that some other special refs where not mentioned in 'gitrevisions' nor suggested by the completion, so I also tried to improve that.

Since the changes are in the same parts of the same files, I thought it made more sense to send everything in the same series to avoid conflicts, but I can send the AUTO_MERGE patches on top of the other ones in a separate series if that would be preferred.

Here is a breakdown of the patches. First the "other special refs" patches:
 * [PATCH 1/5] revisions.txt: document more special refs
 * [PATCH 2/5] completion: complete REVERT_HEAD and BISECT_HEAD
Then a preparatory cleanup for the AUTO_MERGE patches:
 * [PATCH 3/5] git-merge.txt: modernize word choice in "True merge" section
Finally the AUTO_MERGE patches:
 * [PATCH 4/5] Documentation: document AUTO_MERGE
 * [PATCH 5/5] completion: complete AUTO_MERGE

Thanks Elijah for this very useful feature! Dscho, I'm CC-ing you since you opened https://github.com/gitgitgadget/git/issues/1471, I hope that's OK.

Cheers,
Philippe.
Philippe Blain (5):
  revisions.txt: document more special refs
  completion: complete REVERT_HEAD and BISECT_HEAD
  git-merge.txt: modernize word choice in "True merge" section
  Documentation: document AUTO_MERGE
  completion: complete AUTO_MERGE
 Documentation/git-diff.txt             |  8 +++++++-
 Documentation/git-merge.txt            | 11 ++++++++---
 Documentation/revisions.txt            | 15 ++++++++++++--
 Documentation/user-manual.txt          | 27 ++++++++++++++++++++++++++
 contrib/completion/git-completion.bash |  2 +-
 5 files changed, 56 insertions(+), 7 deletions(-)
base-commit: a0f05f684010332ab3a706979d191b9157643f80
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1515%2Fphil-blain%2Fdoc-auto-merge-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1515/phil-blain/doc-auto-merge-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/1515
-- 
gitgitgadget
Next: Philippe Blain via GitGitGadget
Message 1 of 35 in “Document 'AUTO_MERGE' and more special refs”
  1. 0/5 Document 'AUTO_MERGE' and more special refsPhilippe Blain via GitGitGadget, Apr 14, 2023
  2. 1/5 revisions.txt: document more special refsPhilippe Blain via GitGitGadget, Apr 14, 2023
  3. Junio C HamanoApr 14, 2023
  4. Felipe ContrerasApr 15, 2023
  5. Victoria DyeApr 14, 2023
  6. Taylor BlauApr 14, 2023
  7. Felipe ContrerasApr 15, 2023
  8. 3/5 git-merge.txt: modernize word choice in "True merge" sectionPhilippe Blain via GitGitGadget, Apr 14, 2023
  9. Junio C HamanoApr 14, 2023
  10. 2/5 completion: complete REVERT_HEAD and BISECT_HEADPhilippe Blain via GitGitGadget, Apr 14, 2023
  11. Junio C HamanoApr 14, 2023
  12. 5/5 completion: complete AUTO_MERGEPhilippe Blain via GitGitGadget, Apr 14, 2023
  13. 4/5 Documentation: document AUTO_MERGEPhilippe Blain via GitGitGadget, Apr 14, 2023
  14. Taylor BlauApr 14, 2023
  15. Eric SunshineApr 15, 2023
  16. Elijah NewrenApr 15, 2023
  17. Eric SunshineApr 15, 2023
  18. Elijah NewrenApr 16, 2023
  19. Elijah NewrenApr 15, 2023
  20. Philippe BlainApr 15, 2023
  21. Elijah NewrenApr 15, 2023
  22. Junio C HamanoApr 14, 2023
  23. Victoria DyeApr 14, 2023
  24. Elijah NewrenApr 15, 2023
  25. Chris TorekApr 16, 2023
  26. 0/6 Document 'AUTO_MERGE' and more special refsPhilippe Blain via GitGitGadget, May 22, 2023
  27. 1/6 revisions.txt: use description list for special refsPhilippe Blain via GitGitGadget, May 22, 2023
  28. 2/6 revisions.txt: document more special refsPhilippe Blain via GitGitGadget, May 22, 2023
  29. 4/6 git-merge.txt: modernize word choice in "True merge" sectionPhilippe Blain via GitGitGadget, May 22, 2023
  30. 3/6 completion: complete REVERT_HEAD and BISECT_HEADPhilippe Blain via GitGitGadget, May 22, 2023
  31. 5/6 Documentation: document AUTO_MERGEPhilippe Blain via GitGitGadget, May 22, 2023
  32. 6/6 completion: complete AUTO_MERGEPhilippe Blain via GitGitGadget, May 22, 2023
  33. Elijah NewrenJun 1, 2023
  34. Junio C HamanoJun 1, 2023
  35. Junio C HamanoJun 1, 2023

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.