From: Elijah Newren <newren@gmail.com>
Date: Thu, 14 Feb 2019 16:38:20 GMT
Subject: Re: [PATCH] docs/git-rebase: Remove redundant entry in incompatible options list.
Message-ID: <CABPp-BFLW5mgPH_Ui3+HGToBtS8eHiAcJ54231_rZ-qC6rOj2g@mail.gmail.com>
In-Reply-To: <20190213234433.31597-1-emilio@crisal.io>

On Thu, Feb 14, 2019 at 7:55 AM Emilio Cobos Álvarez <emilio@crisal.io> wrote:
>
> The --autosquash option is implied by the earlier --[no-]autosquash
> entry in the list.
>
> Signed-off-by: Emilio Cobos Álvarez <emilio@crisal.io>
> ---
>  Documentation/git-rebase.txt | 1 -
>  1 file changed, 1 deletion(-)
>
> diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
> index daa16403ec..daeaa1d0c7 100644
> --- a/Documentation/git-rebase.txt
> +++ b/Documentation/git-rebase.txt
> @@ -529,7 +529,6 @@ are incompatible with the following options:
>   * --interactive
>   * --exec
>   * --keep-empty
> - * --autosquash
>   * --edit-todo
>   * --root when used in combination with --onto
>
> --
> 2.20.1

Oops; thanks for catching my mistake.

Reviewed-by: Elijah Newren <newren@gmail.com>