docs/git-rebase: remove redundant entry in incompatible options list
authorEmilio Cobos Álvarez <emilio@crisal.io>
Wed, 13 Feb 2019 23:44:33 +0000 (00:44 +0100)
committerJunio C Hamano <gitster@pobox.com>
Thu, 14 Feb 2019 19:54:27 +0000 (11:54 -0800)
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>
Documentation/git-rebase.txt
index dff17b31788fec085b91314b3b3328c689050628..186c5d0cf6d665fa1f2dd9403aab4198f055c458 100644 (file)
@@ -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