Merge branch 'dl/rebase-i-keep-base'

diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 3146c1592deaa9790e143694bc9b5a07bb47d254..639a4179d18e4d154f30351aaa4f3b3c79c48c1e 100644 (file)
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -565,8 +565,6 @@ In addition, the following pairs of options are incompatible:
  * --preserve-merges and --interactive
  * --preserve-merges and --signoff
  * --preserve-merges and --rebase-merges
- * --rebase-merges and --strategy
- * --rebase-merges and --strategy-option
  * --keep-base and --onto
  * --keep-base and --root
 
@@ -856,7 +854,8 @@ Hard case: The changes are not the same.::
        This happens if the 'subsystem' rebase had conflicts, or used
        `--interactive` to omit, edit, squash, or fixup commits; or
        if the upstream used one of `commit --amend`, `reset`, or
-       `filter-branch`.
+       a full history rewriting command like
+       https://github.com/newren/git-filter-repo[`filter-repo`].
 
 
 The easy case