threads / patch / 50498

patchdocs/git-rebase: Remove redundant entry in incompatible options list.

Subject: [PATCH] docs/git-rebase: Remove redundant entry in incompatible options list.

## tl;dr

2 messages between Feb 13, 2019 and Feb 14, 2019. Diffs are folded; open one to read it.

replies: 1people: 2as markdown or json

Emilio Cobos Álvarez· Feb 13, 2019, 23:44 UTC · lore

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(-)

Show changes to Documentation/git-rebase.txt +0 −1

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· Feb 14, 2019, 16:38 UTC · re: Emilio Cobos Álvarez · lore

Re: [PATCH] docs/git-rebase: Remove redundant entry in incompatible options list.

On Thu, Feb 14, 2019 at 7:55 AM Emilio Cobos Álvarez <emilio@crisal.io> wrote:

Show 23 quoted lines

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