Re: [PATCH] show --continue/skip etc. consistently in synopsis

From: Elijah Newren <newren@gmail.com>
Date: Jun 17, 2019, 02:02 UTC
Message-ID: <CABPp-BFAJtY2Bzow6T6kYoFqYifKzMinmjF0_EJa-fepcWcppQ@mail.gmail.com>
In-Reply-To: <20190616132457.19413-1-phillip.wood123@gmail.com>

On Sun, Jun 16, 2019 at 6:29 AM Phillip Wood <phillip.wood123@gmail.com> wrote:

Show 7 quoted lines

>
> From: Phillip Wood <phillip.wood@dunelm.org.uk>
>
> 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...

Show 20 quoted lines

> ---
> 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..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?