]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 693bde4 982ff3a)
Merge branch 'pb/complete-and-document-auto-merge-and-friends'
authorJunio C Hamano <gitster@pobox.com>
Tue, 20 Jun 2023 22:53:11 +0000 (15:53 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 20 Jun 2023 22:53:12 +0000 (15:53 -0700)
commit0899beb63c525c8254b2367e879cc8744092243f
tree4c8c18447ccaf123bcd02ac9090c7479313ed866tree | snapshot
parent693bde461cfc3b2bd448ebc3c300302a167febbacommit | diff
parent982ff3a649221d9db79049e5823425f645b3228ecommit | diff
Merge branch 'pb/complete-and-document-auto-merge-and-friends'

Document more pseudo-refs and teach the command line completion
machinery to complete AUTO_MERGE.

* pb/complete-and-document-auto-merge-and-friends:
  completion: complete AUTO_MERGE
  Documentation: document AUTO_MERGE
  git-merge.txt: modernize word choice in "True merge" section
  completion: complete REVERT_HEAD and BISECT_HEAD
  revisions.txt: document more special refs
  revisions.txt: use description list for special refs
Unnamed repository; edit this file 'description' to name the repository.