diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-08-01 15:36:52 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-08-01 15:36:52 -0700 |
| commit | 408189a8ada390473056e79a2ac4408e776944ab (patch) | |
| tree | 9cc139baae0aaede93552a7fa62804ff533788a3 /git-config.html | |
| parent | 9c649b47c0e8b27d2fe0f207b4fb8196978050a4 (diff) | |
| download | git-htmldocs-408189a8ada390473056e79a2ac4408e776944ab.tar.gz | |
Autogenerated HTML docs for v2.28.0-89-g85b4e0
Diffstat (limited to 'git-config.html')
| -rw-r--r-- | git-config.html | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/git-config.html b/git-config.html index 97875accf..0bf2d5e99 100644 --- a/git-config.html +++ b/git-config.html @@ -6988,6 +6988,22 @@ merge.log </p>
</dd>
<dt class="hdlist1">
+merge.suppressDest
+</dt>
+<dd>
+<p>
+ By adding a glob that matches the names of integration
+ branches to this multi-valued configuration variable, the
+ default merge message computed for merges into these
+ integration branches will omit " into <branch name>" from
+ its title.
+</p>
+<div class="paragraph"><p>An element with an empty value can be used to clear the list
+of globs accumulated from previous configuration entries.
+When there is no <code>merge.suppressDest</code> variable defined, the
+default value of <code>master</code> is used for backward compatibility.</p></div>
+</dd>
+<dt class="hdlist1">
merge.renameLimit
</dt>
<dd>
|