1 files changed, 15 insertions, 0 deletions
diff --git a/git-config.html b/git-config.html
index 5988cbb6d..5b66fef78 100644
--- a/git-config.html
+++ b/git-config.html
@@ -9595,6 +9595,21 @@ rebase.forkPoint
 </p>
 </dd>
 <dt class="hdlist1">
+rebase.rebaseMerges
+</dt>
+<dd>
+<p>
+        Whether and how to set the <code>--rebase-merges</code> option by default. Can
+        be <code>rebase-cousins</code>, <code>no-rebase-cousins</code>, or a boolean. Setting to
+        true or to <code>no-rebase-cousins</code> is equivalent to
+        <code>--rebase-merges=no-rebase-cousins</code>, setting to <code>rebase-cousins</code> is
+        equivalent to <code>--rebase-merges=rebase-cousins</code>, and setting to false is
+        equivalent to <code>--no-rebase-merges</code>. Passing <code>--rebase-merges</code> on the
+        command line, with or without an argument, overrides any
+        <code>rebase.rebaseMerges</code> configuration.
+</p>
+</dd>
+<dt class="hdlist1">
 receive.advertiseAtomic
 </dt>
 <dd>