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>
Ævar Arnfjörð Bjarmason committed
Oct 13, 2022 at 17:39 UTC
007512152e1c8cf64dbb12d8bbc86f5a2514b78d
2 files changed
+20
-20
Documentation/git-stash.txt
+6
-6
@@ -9,17 +9,17 @@ SYNOPSIS
9
--------
10
[verse]
11
'git stash' list [<log-options>]
12
-'git stash' show [-u|--include-untracked|--only-untracked] [<diff-options>] [<stash>]
13
-'git stash' drop [-q|--quiet] [<stash>]
14
-'git stash' ( pop | apply ) [--index] [-q|--quiet] [<stash>]
12
+'git stash' show [-u | --include-untracked | --only-untracked] [<diff-options>] [<stash>]
13
+'git stash' drop [-q | --quiet] [<stash>]
14
+'git stash' (pop | apply) [--index] [-q | --quiet] [<stash>]
15
'git stash' branch <branchname> [<stash>]
16
-'git stash' [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--quiet]
17
- [-u|--include-untracked] [-a|--all] [(-m|--message) <message>]
16
+'git stash' [push [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q | --quiet]
17
+ [-u | --include-untracked] [-a | --all] [(-m | --message) <message>]
18
[--pathspec-from-file=<file> [--pathspec-file-nul]]
19
[--] [<pathspec>...]]
20
'git stash' clear
21
'git stash' create [<message>]
22
-'git stash' store [(-m|--message) <message>] [-q|--quiet] <commit>
22
+'git stash' store [(-m | --message) <message>] [-q | --quiet] <commit>
23
24
DESCRIPTION
25
-----------
builtin/stash.c
+14
-14
@@ -24,16 +24,16 @@
24
static const char * const git_stash_usage[] = {
25
N_("git stash list [<options>]"),
26
N_("git stash show [<options>] [<stash>]"),
27
- N_("git stash drop [-q|--quiet] [<stash>]"),
28
- N_("git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"),
27
+ N_("git stash drop [-q | --quiet] [<stash>]"),
28
+ N_("git stash (pop | apply) [--index] [-q | --quiet] [<stash>]"),
29
N_("git stash branch <branchname> [<stash>]"),
30
"git stash clear",
31
- N_("git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--quiet]\n"
32
- " [-u|--include-untracked] [-a|--all] [(-m|--message) <message>]\n"
31
+ N_("git stash [push [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q | --quiet]\n"
32
+ " [-u | --include-untracked] [-a | --all] [(-m | --message) <message>]\n"
33
" [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
34
" [--] [<pathspec>...]]"),
35
- N_("git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--quiet]\n"
36
- " [-u|--include-untracked] [-a|--all] [<message>]"),
35
+ N_("git stash save [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q | --quiet]\n"
36
+ " [-u | --include-untracked] [-a | --all] [<message>]"),
37
NULL
38
};
39
@@ -48,17 +48,17 @@ static const char * const git_stash_show_usage[] = {
48
};
49
50
static const char * const git_stash_drop_usage[] = {
51
- N_("git stash drop [-q|--quiet] [<stash>]"),
51
+ N_("git stash drop [-q | --quiet] [<stash>]"),
52
NULL
53
};
54
55
static const char * const git_stash_pop_usage[] = {
56
- N_("git stash pop [--index] [-q|--quiet] [<stash>]"),
56
+ N_("git stash pop [--index] [-q | --quiet] [<stash>]"),
57
NULL
58
};
59
60
static const char * const git_stash_apply_usage[] = {
61
- N_("git stash apply [--index] [-q|--quiet] [<stash>]"),
61
+ N_("git stash apply [--index] [-q | --quiet] [<stash>]"),
62
NULL
63
};
64
@@ -73,20 +73,20 @@ static const char * const git_stash_clear_usage[] = {
73
};
74
75
static const char * const git_stash_store_usage[] = {
76
- N_("git stash store [(-m|--message) <message>] [-q|--quiet] <commit>"),
76
+ N_("git stash store [(-m | --message) <message>] [-q | --quiet] <commit>"),
77
NULL
78
};
79
80
static const char * const git_stash_push_usage[] = {
81
- N_("git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
82
- " [-u|--include-untracked] [-a|--all] [(-m|--message) <message>]\n"
81
+ N_("git stash [push [-p | --patch] [-k | --[no-]keep-index] [-q | --quiet]\n"
82
+ " [-u | --include-untracked] [-a | --all] [(-m | --message) <message>]\n"
83
" [--] [<pathspec>...]]"),
84
NULL
85
};
86
87
static const char * const git_stash_save_usage[] = {
88
- N_("git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
89
- " [-u|--include-untracked] [-a|--all] [<message>]"),
88
+ N_("git stash save [-p | --patch] [-k | --[no-]keep-index] [-q | --quiet]\n"
89
+ " [-u | --include-untracked] [-a | --all] [<message>]"),
90
NULL
91
};
92