# [PATCH] docs/git-rebase: Remove redundant entry in incompatible options list. 2 messages from 2019-02-13 to 2019-02-14. Participants: Emilio Cobos Álvarez, Elijah Newren. Thread: https://gitlist.dev/t/50498 ## Emilio Cobos Álvarez, 2019-02-13 23:44 Subject: [PATCH] docs/git-rebase: Remove redundant entry in incompatible options list. Message-ID: <20190213234433.31597-1-emilio@crisal.io> URL: https://gitlist.dev/e/20190213234433.31597-1-emilio%40crisal.io ``` The --autosquash option is implied by the earlier --[no-]autosquash entry in the list. Signed-off-by: Emilio Cobos Álvarez --- 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 ``` ## Elijah Newren, 2019-02-14 16:38 Subject: Re: [PATCH] docs/git-rebase: Remove redundant entry in incompatible options list. Message-ID: URL: https://gitlist.dev/e/CABPp-BFLW5mgPH_Ui3%2BHGToBtS8eHiAcJ54231_rZ-qC6rOj2g%40mail.gmail.com In-Reply-To: <20190213234433.31597-1-emilio@crisal.io> ``` On Thu, Feb 14, 2019 at 7:55 AM Emilio Cobos Álvarez wrote: > > The --autosquash option is implied by the earlier --[no-]autosquash > entry in the list. > > Signed-off-by: Emilio Cobos Álvarez > --- > 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 ```