On 17/06/2019 03:02, Elijah Newren wrote: > On Sun, Jun 16, 2019 at 6:29 AM Phillip Wood <phillip.wood123@xxxxxxxxx> wrote: >> >> From: Phillip Wood <phillip.wood@xxxxxxxxxxxxx> >> >> 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. > > Thanks for working to make this more consistent. One minor issue... > >> --- >> 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@xxxxxxxxx/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..07ca9fb78c 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 | --skip | --abort | --quit) > > merge --skip? I think you meant to just add --quit here, but copied > from elsewhere and accidentally inserted --skip? Thanks, you're right I got a bit carried away with copying and pasting. Best Wishes Phillip
