diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2021-09-22 01:40:34 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-09-23 20:30:43 +0300 |
| commit | 1ed4bef6b438d25ce605f6bdefb4c98569dad137 (patch) | |
| tree | eddeffb3f20bdc8cee1317de28bc5ee8c4f56bad /Documentation/git-help.txt | |
| parent | ff76fc841f4787e7c91329ecda280f293100eccb (diff) | |
help: correct logic error in combining --all and --config
Fix a bug in the --config option that's been there ever since its
introduction in 3ac68a93fd2 (help: add --config to list all available
config, 2018-05-26). Die when --all and --config are combined,
combining them doesn't make sense.
The code for the --config option when combined with an earlier
refactoring done to support the --guide option in
65f98358c0c (builtin/help.c: add --guide option, 2013-04-02) would
cause us to take the "--all" branch early and ignore the --config
option.
Let's instead list these as incompatible, both in the synopsis and
help output, and enforce it in the code itself.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-help.txt')
| -rw-r--r-- | Documentation/git-help.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/git-help.txt b/Documentation/git-help.txt index cb8e3d4da9..96d5f598b4 100644 --- a/Documentation/git-help.txt +++ b/Documentation/git-help.txt @@ -11,6 +11,7 @@ SYNOPSIS 'git help' [-a|--all [--[no-]verbose]] [[-i|--info] [-m|--man] [-w|--web]] [COMMAND|GUIDE] 'git help' [-g|--guides] +'git help' [-c|--config] DESCRIPTION ----------- |