From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 20 Jun 2023 22:53:11 +0000 (-0700)
Subject: Merge branch 'pb/complete-and-document-auto-merge-and-friends'
X-Git-Tag: v2.42.0-rc0~114
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0899beb63c525c8254b2367e879cc8744092243f;p=thirdparty%2Fgit.git

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
---

0899beb63c525c8254b2367e879cc8744092243f