summaryrefslogtreecommitdiff
path: root/Documentation/git-help.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2022-03-09 13:38:24 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2022-03-09 13:38:24 -0800
commit1f3c5f39e0582b9538106a7da38a5af89e5785a4 (patch)
treec02429a0852b4d47b64027581f1adcecc51e5c35 /Documentation/git-help.txt
parentMerge branch 'ab/c99-variadic-macros' (diff)
parenthelp: don't print "\n" before single-section output (diff)
downloadtgif-1f3c5f39e0582b9538106a7da38a5af89e5785a4.tar.xz
Merge branch 'ab/help-fixes'
Updates to how command line options to "git help" are handled. * ab/help-fixes: help: don't print "\n" before single-section output help: add --no-[external-commands|aliases] for use with --all help: error if [-a|-g|-c] and [-i|-m|-w] are combined help: correct usage & behavior of "git help --all" help: note the option name on option incompatibility help.c: split up list_all_cmds_help() function help tests: test "git" and "git help [-a|-g] spacing help.c: use puts() instead of printf{,_ln}() for consistency help doc: add missing "]" to "[-a|--all]"
Diffstat (limited to 'Documentation/git-help.txt')
-rw-r--r--Documentation/git-help.txt15
1 files changed, 11 insertions, 4 deletions
diff --git a/Documentation/git-help.txt b/Documentation/git-help.txt
index 44ea63cc6d..239c68db45 100644
--- a/Documentation/git-help.txt
+++ b/Documentation/git-help.txt
@@ -8,8 +8,8 @@ git-help - Display help information about Git
SYNOPSIS
--------
[verse]
-'git help' [-a|--all [--[no-]verbose]]
- [[-i|--info] [-m|--man] [-w|--web]] [<command>|<guide>]
+'git help' [-a|--all] [--[no-]verbose] [--[no-]external-commands] [--[no-]aliases]
+'git help' [[-i|--info] [-m|--man] [-w|--web]] [<command>|<guide>]
'git help' [-g|--guides]
'git help' [-c|--config]
@@ -46,8 +46,15 @@ OPTIONS
-------
-a::
--all::
- Prints all the available commands on the standard output. This
- option overrides any given command or guide name.
+ Prints all the available commands on the standard output.
+
+--no-external-commands::
+ When used with `--all`, exclude the listing of external "git-*"
+ commands found in the `$PATH`.
+
+--no-aliases::
+ When used with `--all`, exclude the listing of configured
+ aliases.
--verbose::
When used with `--all` print description for all recognized