Merge branch 'ea/rebase-compat-doc-fix'

* ea/rebase-compat-doc-fix:
docs/git-rebase: remove redundant entry in incompatible options list

diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 619303adbc12e6ce48c657c8b7de76cdef7f5821..5629ba4c5d2b06385911d2c8ba25a496ce78c263 100644 (file)
--- 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