show --continue/skip etc. consistently in synopsis
Command mode options that the user can choose one among many are listed like this in the documentation: git am (--continue | --skip | --abort | --quit) They are listed on a single line and in parenthesis, because they are not optional. But documentation pages for some commands deviate from this norm. Fix the merge and rebase docs to match this style. Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Phillip Wood committed
Jun 17, 2019 at 10:17 UTC
437591a9d738b56141149c9293c3b4840f5302f0
2 files changed
+2
-3
Documentation/git-merge.txt
+1
-2
@@ -13,8 +13,7 @@ SYNOPSIS
13
[-s <strategy>] [-X <strategy-option>] [-S[<keyid>]]
14
[--[no-]allow-unrelated-histories]
15
[--[no-]rerere-autoupdate] [-m <msg>] [-F <file>] [<commit>...]
16
-'git merge' --abort
17
-'git merge' --continue
16
+'git merge' (--continue | --abort | --quit)
17
18
DESCRIPTION
19
-----------
Documentation/git-rebase.txt
+1
-1
@@ -12,7 +12,7 @@ SYNOPSIS
12
[<upstream> [<branch>]]
13
'git rebase' [-i | --interactive] [<options>] [--exec <cmd>] [--onto <newbase>]
14
--root [<branch>]
15
-'git rebase' --continue | --skip | --abort | --quit | --edit-todo | --show-current-patch
15
+'git rebase' (--continue | --skip | --abort | --quit | --edit-todo | --show-current-patch)
16
17
DESCRIPTION
18
-----------