| commit | 0899beb63c525c8254b2367e879cc8744092243f | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 20 Jun 2023 22:53:11 +0000 (20 15:53 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 20 Jun 2023 22:53:12 +0000 (20 15:53 -0700) | ||
| tree | 4c8c18447ccaf123bcd02ac9090c7479313ed866 | treesnapshot (tar.gz zip) |
| parent | 693bde461cfc3b2bd448ebc3c300302a167febba | commitdiff |
| parent | 982ff3a649221d9db79049e5823425f645b3228e | commitdiff |
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
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