summaryrefslogtreecommitdiffstats
path: root/git-config.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-10-04 13:44:12 -0700
committerJunio C Hamano <gitster@pobox.com>2020-10-04 13:44:12 -0700
commit36ebb0e3ab4a7aa8b34196786a989cf6a523c648 (patch)
tree56b92cb7a2d79b1778a381aceec4325bbdf30382 /git-config.html
parent5880aee0090d327fd8b4672385782ce15228f3a4 (diff)
downloadgit-htmldocs-36ebb0e3ab4a7aa8b34196786a989cf6a523c648.tar.gz
Autogenerated HTML docs for v2.28.0-715-gab469
Diffstat (limited to 'git-config.html')
-rw-r--r--git-config.html4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-config.html b/git-config.html
index ab04fe20b..d556e291d 100644
--- a/git-config.html
+++ b/git-config.html
@@ -6955,7 +6955,7 @@ merge.suppressDest
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 &lt;branch name&gt;" from
+ integration branches will omit "into &lt;branch name&gt;" from
its title.
</p>
<div class="paragraph"><p>An element with an empty value can be used to clear the list
@@ -9532,7 +9532,7 @@ uploadpackfilter.tree.maxDepth
</dt>
<dd>
<p>
- Only allow <code>--filter=tree=&lt;n&gt;</code> when <code>n</code> is no more than the value of
+ Only allow <code>--filter=tree:&lt;n&gt;</code> when <code>&lt;n&gt;</code> is no more than the value of
<code>uploadpackfilter.tree.maxDepth</code>. If set, this also implies
<code>uploadpackfilter.tree.allow=true</code>, unless this configuration
variable had already been set. Has no effect if unset.