Merge branch 'js/pre-merge-commit-hook'

diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 6156609cf7149ccf5c1f79df2d9807cdbcc609ba..3136c19fb4ce578ee37c4e3b9b86ab2e47294dc8 100644 (file)
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -543,8 +543,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
 
 BEHAVIORAL DIFFERENCES
 -----------------------