diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-02-22 16:57:12 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-02-22 16:57:12 -0800 |
| commit | a70c988a0584e1197ffd19b26c28e9790da32363 (patch) | |
| tree | eb0f2dd1584011f40e4589c81288ac3b9f3d7c61 /git-config.html | |
| parent | b4fc8e8cbb4fa1443a8546bdff0b1e5cd06f15fd (diff) | |
| download | git-htmldocs-a70c988a0584e1197ffd19b26c28e9790da32363.tar.gz | |
Autogenerated HTML docs for v2.30.1-602-g966e6
Diffstat (limited to 'git-config.html')
| -rw-r--r-- | git-config.html | 47 |
1 files changed, 44 insertions, 3 deletions
diff --git a/git-config.html b/git-config.html index c7ea36497..81392d89e 100644 --- a/git-config.html +++ b/git-config.html @@ -6820,7 +6820,7 @@ init.defaultBranch <dd>
<p>
Allows overriding the default branch name e.g. when initializing
- a new repository or when cloning an empty repository.
+ a new repository.
</p>
</dd>
<dt class="hdlist1">
@@ -6994,6 +6994,21 @@ log.mailmap </p>
</dd>
<dt class="hdlist1">
+lsrefs.unborn
+</dt>
+<dd>
+<p>
+ May be "advertise" (the default), "allow", or "ignore". If "advertise",
+ the server will respond to the client sending "unborn" (as described in
+ protocol-v2.txt) and will advertise support for this feature during the
+ protocol v2 capability advertisement. "allow" is the same as
+ "advertise" except that the server will not advertise support for this
+ feature; this is useful for load-balanced servers that cannot be
+ updated atomically (for example), since the administrator could
+ configure "allow", then after a delay, configure "advertise".
+</p>
+</dd>
+<dt class="hdlist1">
mailinfo.scissors
</dt>
<dd>
@@ -7064,8 +7079,9 @@ maintenance.strategy <p>
<code>incremental</code>: This setting optimizes for performing small maintenance
activities that do not delete any data. This does not schedule the <code>gc</code>
- task, but runs the <code>prefetch</code> and <code>commit-graph</code> tasks hourly and the
- <code>loose-objects</code> and <code>incremental-repack</code> tasks daily.
+ task, but runs the <code>prefetch</code> and <code>commit-graph</code> tasks hourly, the
+ <code>loose-objects</code> and <code>incremental-repack</code> tasks daily, and the <code>pack-refs</code>
+ task weekly.
</p>
</li>
</ul></div>
@@ -7571,6 +7587,16 @@ mergetool.<tool>.cmd </p>
</dd>
<dt class="hdlist1">
+mergetool.<tool>.hideResolved
+</dt>
+<dd>
+<p>
+ Allows the user to override the global <code>mergetool.hideResolved</code> value
+ for a specific tool. See <code>mergetool.hideResolved</code> for the full
+ description.
+</p>
+</dd>
+<dt class="hdlist1">
mergetool.<tool>.trustExitCode
</dt>
<dd>
@@ -7613,6 +7639,21 @@ mergetool.meld.useAutoMerge </p>
</dd>
<dt class="hdlist1">
+mergetool.hideResolved
+</dt>
+<dd>
+<p>
+ During a merge Git will automatically resolve as many conflicts as
+ possible and write the <em>MERGED</em> file containing conflict markers around
+ any conflicts that it cannot resolve; <em>LOCAL</em> and <em>REMOTE</em> normally
+ represent the versions of the file from before Git’s conflict
+ resolution. This flag causes <em>LOCAL</em> and <em>REMOTE</em> to be overwriten so
+ that only the unresolved conflicts are presented to the merge tool. Can
+ be configured per-tool via the <code>mergetool.<tool>.hideResolved</code>
+ configuration variable. Defaults to <code>true</code>.
+</p>
+</dd>
+<dt class="hdlist1">
mergetool.keepBackup
</dt>
<dd>
|