From: Emilio Cobos Álvarez <emilio@crisal.io>
Date: Wed, 13 Feb 2019 23:44:33 +0000 (+0100)
Subject: docs/git-rebase: remove redundant entry in incompatible options list
X-Git-Tag: v2.21.0-rc2~5^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b83ffbdac349b744b87b658d78b7e0b9b7b51954;p=git

docs/git-rebase: remove redundant entry in incompatible options list

The --autosquash option is implied by the earlier --[no-]autosquash
entry in the list.

Signed-off-by: Emilio Cobos Álvarez <emilio@crisal.io>
Reviewed-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index dff17b3178..186c5d0cf6 100644
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -535,7 +535,6 @@ Flags only understood by the interactive backend:
  * --interactive
  * --exec
  * --keep-empty
- * --autosquash
  * --edit-todo
  * --root when used in combination with --onto