[PATCH 14/34] stash doc SYNOPSIS & -h: correct padding around "[]()"
- From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
- Date
- Sep 5, 2022, 08:26 UTC
- Message-ID
- <patch-14.34-12ec2627504-20220902T092734Z-avarab@gmail.com>
- In-Reply-To
- <cover-00.34-00000000000-20220902T092734Z-avarab@gmail.com>
The whitespace padding of alternatives should be of the form "[-f | --force]" not "[-f|--force]". Likewise we should not have padding before the first option, so "(--all | <pack-filename>...)" is correct, not "( --all | <pack-filename>... )".
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> --- Documentation/git-stash.txt | 12 ++++++------ builtin/stash.c | 28 ++++++++++++++-------------- 2 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/Documentation/git-stash.txt b/Documentation/git-stash.txt index 0df21321e50..379bea645db 100644 --- a/Documentation/git-stash.txt +++ b/Documentation/git-stash.txt @@ -9,17 +9,17 @@ SYNOPSIS -------- [verse] 'git stash' list [<log-options>] -'git stash' show [-u|--include-untracked|--only-untracked] [<diff-options>] [<stash>] -'git stash' drop [-q|--quiet] [<stash>] -'git stash' ( pop | apply ) [--index] [-q|--quiet] [<stash>] +'git stash' show [-u | --include-untracked | --only-untracked] [<diff-options>] [<stash>] +'git stash' drop [-q | --quiet] [<stash>] +'git stash' (pop | apply) [--index] [-q | --quiet] [<stash>] 'git stash' branch <branchname> [<stash>] -'git stash' [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--quiet] - [-u|--include-untracked] [-a|--all] [(-m|--message) <message>] +'git stash' [push [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q | --quiet] + [-u | --include-untracked] [-a | --all] [(-m | --message) <message>] [--pathspec-from-file=<file> [--pathspec-file-nul]] [--] [<pathspec>...]] 'git stash' clear 'git stash' create [<message>] -'git stash' store [(-m|--message) <message>] [-q|--quiet] <commit> +'git stash' store [(-m | --message) <message>] [-q | --quiet] <commit> DESCRIPTION ----------- diff --git a/builtin/stash.c b/builtin/stash.c index 0fc359e9d39..7d82ead6760 100644 --- a/builtin/stash.c +++ b/builtin/stash.c @@ -24,16 +24,16 @@ static const char * const git_stash_usage[] = { N_("git stash list [<options>]"), N_("git stash show [<options>] [<stash>]"), - N_("git stash drop [-q|--quiet] [<stash>]"), - N_("git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"), + N_("git stash drop [-q | --quiet] [<stash>]"), + N_("git stash (pop | apply) [--index] [-q | --quiet] [<stash>]"), N_("git stash branch <branchname> [<stash>]"), "git stash clear", - N_("git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--quiet]\n" - " [-u|--include-untracked] [-a|--all] [(-m|--message) <message>]\n" + N_("git stash [push [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q | --quiet]\n" + " [-u | --include-untracked] [-a | --all] [(-m | --message) <message>]\n" " [--pathspec-from-file=<file> [--pathspec-file-nul]]\n" " [--] [<pathspec>...]]"), - N_("git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--quiet]\n" - " [-u|--include-untracked] [-a|--all] [<message>]"), + N_("git stash save [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q | --quiet]\n" + " [-u | --include-untracked] [-a | --all] [<message>]"), NULL }; @@ -48,17 +48,17 @@ static const char * const git_stash_show_usage[] = { }; static const char * const git_stash_drop_usage[] = { - N_("git stash drop [-q|--quiet] [<stash>]"), + N_("git stash drop [-q | --quiet] [<stash>]"), NULL }; static const char * const git_stash_pop_usage[] = { - N_("git stash pop [--index] [-q|--quiet] [<stash>]"), + N_("git stash pop [--index] [-q | --quiet] [<stash>]"), NULL }; static const char * const git_stash_apply_usage[] = { - N_("git stash apply [--index] [-q|--quiet] [<stash>]"), + N_("git stash apply [--index] [-q | --quiet] [<stash>]"), NULL }; @@ -73,20 +73,20 @@ static const char * const git_stash_clear_usage[] = { }; static const char * const git_stash_store_usage[] = { - N_("git stash store [(-m|--message) <message>] [-q|--quiet] <commit>"), + N_("git stash store [(-m | --message) <message>] [-q | --quiet] <commit>"), NULL }; static const char * const git_stash_push_usage[] = { - N_("git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" - " [-u|--include-untracked] [-a|--all] [(-m|--message) <message>]\n" + N_("git stash [push [-p | --patch] [-k | --[no-]keep-index] [-q | --quiet]\n" + " [-u | --include-untracked] [-a | --all] [(-m | --message) <message>]\n" " [--] [<pathspec>...]]"), NULL }; static const char * const git_stash_save_usage[] = { - N_("git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" - " [-u|--include-untracked] [-a|--all] [<message>]"), + N_("git stash save [-p | --patch] [-k | --[no-]keep-index] [-q | --quiet]\n" + " [-u | --include-untracked] [-a | --all] [<message>]"), NULL };
-- 2.37.3.1425.g73df845bcb2