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

* ea/rebase-compat-doc-fix:
  docs/git-rebase: remove redundant entry in incompatible options list
This commit is contained in:
Junio C Hamano 2019-02-14 14:28:22 -08:00
commit 2d08f3deb9

View file

@ -529,7 +529,6 @@ are incompatible with the following options:
* --interactive
* --exec
* --keep-empty
* --autosquash
* --edit-todo
* --root when used in combination with --onto