Skip to content

Commit 0075121

Browse files
avargitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent e2f4e7e commit 0075121

File tree

2 files changed

+20
-20
lines changed

2 files changed

+20
-20
lines changed

Documentation/git-stash.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@ SYNOPSIS
99
--------
1010
[verse]
1111
'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>]
1515
'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>]
1818
[--pathspec-from-file=<file> [--pathspec-file-nul]]
1919
[--] [<pathspec>...]]
2020
'git stash' clear
2121
'git stash' create [<message>]
22-
'git stash' store [(-m|--message) <message>] [-q|--quiet] <commit>
22+
'git stash' store [(-m | --message) <message>] [-q | --quiet] <commit>
2323

2424
DESCRIPTION
2525
-----------

builtin/stash.c

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,16 @@
2424
static const char * const git_stash_usage[] = {
2525
N_("git stash list [<options>]"),
2626
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>]"),
2929
N_("git stash branch <branchname> [<stash>]"),
3030
"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"
3333
" [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
3434
" [--] [<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>]"),
3737
NULL
3838
};
3939

@@ -48,17 +48,17 @@ static const char * const git_stash_show_usage[] = {
4848
};
4949

5050
static const char * const git_stash_drop_usage[] = {
51-
N_("git stash drop [-q|--quiet] [<stash>]"),
51+
N_("git stash drop [-q | --quiet] [<stash>]"),
5252
NULL
5353
};
5454

5555
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>]"),
5757
NULL
5858
};
5959

6060
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>]"),
6262
NULL
6363
};
6464

@@ -73,20 +73,20 @@ static const char * const git_stash_clear_usage[] = {
7373
};
7474

7575
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>"),
7777
NULL
7878
};
7979

8080
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"
8383
" [--] [<pathspec>...]]"),
8484
NULL
8585
};
8686

8787
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>]"),
9090
NULL
9191
};
9292

0 commit comments

Comments
 (0)