diff options
author | Junio C Hamano <gitster@pobox.com> | 2023-04-04 16:19:06 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2023-04-04 16:19:06 -0700 |
commit | 3acb2e7b34954a141e76b0004a474d276bc86657 (patch) | |
tree | 9f58d4850d4d4ff91d24034c346a297fb8bc0f64 /git-config.html | |
parent | 2c6fc7e6eff6094e52759550c7b28d37f3fb1ffc (diff) | |
download | git-htmldocs-3acb2e7b34954a141e76b0004a474d276bc86657.tar.gz |
Autogenerated HTML docs for v2.40.0-214-gae73b
Diffstat (limited to 'git-config.html')
-rw-r--r-- | git-config.html | 15 |
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>
|