diff options
author | Phillip Wood <phillip.wood@dunelm.org.uk> | 2019-06-17 12:17:09 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-06-18 04:18:23 +0300 |
commit | 437591a9d738b56141149c9293c3b4840f5302f0 (patch) | |
tree | 59f162eaf160a5e02cd88061c43cc4167f638879 | |
parent | f3f8311ec76f9bcdc7e26a125e585eb4e473a8d2 (diff) |
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>
-rw-r--r-- | Documentation/git-merge.txt | 3 | ||||
-rw-r--r-- | Documentation/git-rebase.txt | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index b7d581fc76..926ea4f460 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 ----------- diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 5629ba4c5d..a67d40596a 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -12,7 +12,7 @@ SYNOPSIS [<upstream> [<branch>]] 'git rebase' [-i | --interactive] [<options>] [--exec <cmd>] [--onto <newbase>] --root [<branch>] -'git rebase' --continue | --skip | --abort | --quit | --edit-todo | --show-current-patch +'git rebase' (--continue | --skip | --abort | --quit | --edit-todo | --show-current-patch) DESCRIPTION ----------- |