From: Phillip Wood Date: Mon, 17 Jun 2019 09:17:09 GMT Subject: [PATCH v2] show --continue/skip etc. consistently in synopsis Message-ID: <20190617091709.5785-1-phillip.wood123@gmail.com> In-Reply-To: <20190616132457.19413-1-phillip.wood123@gmail.com> From: Phillip Wood The synopsis for am shows the command mode options as (--continue | --skip | --abort | --quit) They are on a single line and in parenthesis as they are not optional. Fix the merge and rebase docs to match this style. Signed-off-by: Phillip Wood --- Notes: This patch is based on top of nd/merge-quit. The docs for cherry-pick/revert are updated to this style by https://public-inbox.org/git/20190616082040.9440-1-rohit.ashiwal265@gmail.com/T/#u Documentation/git-merge.txt | 3 +-- 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 ] [-X ] [-S[]] [--[no-]allow-unrelated-histories] [--[no-]rerere-autoupdate] [-m ] [-F ] [...] -'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 [ []] 'git rebase' [-i | --interactive] [] [--exec ] [--onto ] --root [] -'git rebase' --continue | --skip | --abort | --quit | --edit-todo | --show-current-patch +'git rebase' (--continue | --skip | --abort | --quit | --edit-todo | --show-current-patch) DESCRIPTION ----------- -- 2.21.0