On Thu, Feb 14, 2019 at 7:55 AM Emilio Cobos Álvarez <[email protected]> wrote: > > The --autosquash option is implied by the earlier --[no-]autosquash > entry in the list. > > Signed-off-by: Emilio Cobos Álvarez <[email protected]> > --- > 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 <[email protected]>
