summaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
diff options
context:
space:
mode:
authorPhillip Wood <phillip.wood@dunelm.org.uk>2019-06-17 09:17:09 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-06-18 01:18:23 (GMT)
commit437591a9d738b56141149c9293c3b4840f5302f0 (patch)
tree59f162eaf160a5e02cd88061c43cc4167f638879 /Documentation/git-merge.txt
parentf3f8311ec76f9bcdc7e26a125e585eb4e473a8d2 (diff)
downloadgit-437591a9d738b56141149c9293c3b4840f5302f0.zip
git-437591a9d738b56141149c9293c3b4840f5302f0.tar.gz
git-437591a9d738b56141149c9293c3b4840f5302f0.tar.bz2
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>
Diffstat (limited to 'Documentation/git-merge.txt')
-rw-r--r--Documentation/git-merge.txt3
1 files changed, 1 insertions, 2 deletions
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index b7d581f..926ea4f 100644
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -13,8 +13,7 @@ SYNOPSIS
[-s <strategy>] [-X <strategy-option>] [-S[<keyid>]]
[--[no-]allow-unrelated-histories]
[--[no-]rerere-autoupdate] [-m <msg>] [-F <file>] [<commit>...]
-'git merge' --abort
-'git merge' --continue
+'git merge' (--continue | --abort | --quit)
DESCRIPTION
-----------