gitsubmodules: align html and nroff lists

diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index daa16403ece9f0f050da5a24086e89b181d9c0fa..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
 
@@ -554,8 +553,6 @@ commit started empty (had no changes relative to its parent to
 start with) or ended empty (all changes were already applied
 upstream in other commits).
 
-The merge backend does the same.
-
 The interactive backend drops commits by default that
 started empty and halts if it hits a commit that ended up empty.
 The `--keep-empty` option exists for the interactive backend to allow