Merge branch 'jc/completion-no-single-letter-options' into seen

gitster · gitster · commit b526217fa332 · 2025-12-07T10:09:11.000+09:00
* jc/completion-no-single-letter-options:
  completion: clarify support for short options and arguments
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
@@ -13,7 +13,8 @@
 #    *) git email aliases for git-send-email
 #    *) tree paths within 'ref:path/to/file' expressions
 #    *) file paths within current working directory and index
-#    *) common --long-options
+#    *) common --long-options but not single-letter options
+#    *) arguments to long and single-letter options
 #
 # To use these routines:
 #

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,8 @@`
`13`	`13`	`# *) git email aliases for git-send-email`
`14`	`14`	`# *) tree paths within 'ref:path/to/file' expressions`
`15`	`15`	`# *) file paths within current working directory and index`
`16`		`-# *) common --long-options`
	`16`	`+# *) common --long-options but not single-letter options`
	`17`	`+# *) arguments to long and single-letter options`
`17`	`18`	`#`
`18`	`19`	`# To use these routines:`
`19`	`20`	`#`