mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stash doc SYNOPSIS & -h: correct padding around "[]()"

Browse Source 
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>
This commit is contained in:
Ævar Arnfjörð Bjarmason
2022-10-13 17:39:07 +02:00
committed by Junio C Hamano
parent e2f4e7e8c0
commit 007512152e
2 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Documentation/git-stash.txt
View File

@ -9,17 +9,17 @@ SYNOPSIS
-------- --------
[verse] [verse]
'git stash' list [<log-options>] 'git stash' list [<log-options>]
'git stash' show [-u|--include-untracked|--only-untracked] [<diff-options>] [<stash>] 'git stash' show [-u | --include-untracked | --only-untracked] [<diff-options>] [<stash>]
'git stash' drop [-q|--quiet] [<stash>] 'git stash' drop [-q | --quiet] [<stash>]
'git stash' ( pop | apply ) [--index] [-q|--quiet] [<stash>] 'git stash' (pop | apply) [--index] [-q | --quiet] [<stash>]
'git stash' branch <branchname> [<stash>] 'git stash' branch <branchname> [<stash>]
'git stash' [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--quiet] 'git stash' [push [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q | --quiet]
[-u|--include-untracked] [-a|--all] [(-m|--message) <message>] [-u | --include-untracked] [-a | --all] [(-m | --message) <message>]
[--pathspec-from-file=<file> [--pathspec-file-nul]] [--pathspec-from-file=<file> [--pathspec-file-nul]]
[--] [<pathspec>...]] [--] [<pathspec>...]]
'git stash' clear 'git stash' clear
'git stash' create [<message>] 'git stash' create [<message>]
'git stash' store [(-m|--message) <message>] [-q|--quiet] <commit> 'git stash' store [(-m | --message) <message>] [-q | --quiet] <commit>
DESCRIPTION DESCRIPTION
----------- -----------

28
builtin/stash.c
View File

@ -24,16 +24,16 @@
static const char * const git_stash_usage[] = { static const char * const git_stash_usage[] = {
N_("git stash list [<options>]"), N_("git stash list [<options>]"),
N_("git stash show [<options>] [<stash>]"), N_("git stash show [<options>] [<stash>]"),
N_("git stash drop [-q|--quiet] [<stash>]"), N_("git stash drop [-q | --quiet] [<stash>]"),
N_("git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"), N_("git stash (pop | apply) [--index] [-q | --quiet] [<stash>]"),
N_("git stash branch <branchname> [<stash>]"), N_("git stash branch <branchname> [<stash>]"),
"git stash clear", "git stash clear",
N_("git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--quiet]\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" " [-u | --include-untracked] [-a | --all] [(-m | --message) <message>]\n"
" [--pathspec-from-file=<file> [--pathspec-file-nul]]\n" " [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
" [--] [<pathspec>...]]"), " [--] [<pathspec>...]]"),
N_("git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--quiet]\n" N_("git stash save [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q | --quiet]\n"
" [-u|--include-untracked] [-a|--all] [<message>]"), " [-u | --include-untracked] [-a | --all] [<message>]"),
NULL NULL
}; };
@ -48,17 +48,17 @@ static const char * const git_stash_show_usage[] = {
}; };
static const char * const git_stash_drop_usage[] = { static const char * const git_stash_drop_usage[] = {
N_("git stash drop [-q|--quiet] [<stash>]"), N_("git stash drop [-q | --quiet] [<stash>]"),
NULL NULL
}; };
static const char * const git_stash_pop_usage[] = { 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 NULL
}; };
static const char * const git_stash_apply_usage[] = { 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 NULL
}; };
@ -73,20 +73,20 @@ static const char * const git_stash_clear_usage[] = {
}; };
static const char * const git_stash_store_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 NULL
}; };
static const char * const git_stash_push_usage[] = { static const char * const git_stash_push_usage[] = {
N_("git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" N_("git stash [push [-p | --patch] [-k | --[no-]keep-index] [-q | --quiet]\n"
" [-u|--include-untracked] [-a|--all] [(-m|--message) <message>]\n" " [-u | --include-untracked] [-a | --all] [(-m | --message) <message>]\n"
" [--] [<pathspec>...]]"), " [--] [<pathspec>...]]"),
NULL NULL
}; };
static const char * const git_stash_save_usage[] = { static const char * const git_stash_save_usage[] = {
N_("git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" N_("git stash save [-p | --patch] [-k | --[no-]keep-index] [-q | --quiet]\n"
" [-u|--include-untracked] [-a|--all] [<message>]"), " [-u | --include-untracked] [-a | --all] [<message>]"),
NULL NULL
}; };