Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>2022-10-13 18:39:07 +0300
committerJunio C Hamano <gitster@pobox.com>2022-10-13 19:32:55 +0300
commit007512152e1c8cf64dbb12d8bbc86f5a2514b78d (patch)
tree84de6855072eed35c362dbc9509e5bd4fd7f1e09 /builtin/stash.c
parente2f4e7e8c0f77e45c51ac937fb870351517437c8 (diff)
stash doc SYNOPSIS & -h: correct padding around "[]()"
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> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/stash.c')
-rw-r--r--builtin/stash.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/builtin/stash.c b/builtin/stash.c
index 0fc359e9d3..7d82ead676 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
};