diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-01-25 15:32:33 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-01-25 15:32:33 -0800 |
| commit | 7887f9b4eb248358cc8e6937ceb87b9f072ce9e5 (patch) | |
| tree | d5670ef418f9f7d4a5780ee5d3d01696abb477aa /git-config.html | |
| parent | d5cfc8f5a014ca40c71c8355aa37074cc885297e (diff) | |
| download | git-htmldocs-7887f9b4eb248358cc8e6937ceb87b9f072ce9e5.tar.gz | |
Autogenerated HTML docs for v2.30.0-335-ge63628
Diffstat (limited to 'git-config.html')
| -rw-r--r-- | git-config.html | 250 |
1 files changed, 249 insertions, 1 deletions
diff --git a/git-config.html b/git-config.html index 276f9c089..2371d2d94 100644 --- a/git-config.html +++ b/git-config.html @@ -1332,6 +1332,32 @@ GIT_CONFIG_NOSYSTEM </dd>
</dl></div>
<div class="paragraph"><p>See also <a href="#FILES">[FILES]</a>.</p></div>
+<div class="dlist"><dl>
+<dt class="hdlist1">
+GIT_CONFIG_COUNT
+</dt>
+<dt class="hdlist1">
+GIT_CONFIG_KEY_<n>
+</dt>
+<dt class="hdlist1">
+GIT_CONFIG_VALUE_<n>
+</dt>
+<dd>
+<p>
+ If GIT_CONFIG_COUNT is set to a positive number, all environment pairs
+ GIT_CONFIG_KEY_<n> and GIT_CONFIG_VALUE_<n> up to that number will be
+ added to the process’s runtime configuration. The config pairs are
+ zero-indexed. Any missing key or value is treated as an error. An empty
+ GIT_CONFIG_COUNT is treated the same as GIT_CONFIG_COUNT=0, namely no
+ pairs are processed. These environment variables will override values
+ in configuration files, but will be overridden by any explicit options
+ passed via <code>git -c</code>.
+</p>
+<div class="paragraph"><p>This is useful for cases where you want to spawn multiple git commands
+with a common configuration but cannot depend on a configuration file,
+for example when writing scripts.</p></div>
+</dd>
+</dl></div>
</div>
</div>
<div class="sect1">
@@ -4238,6 +4264,8 @@ diff.ignoreSubmodules and <em>git status</em> when <code>status.submoduleSummary</code> is set unless it is
overridden by using the --ignore-submodules command-line option.
The <em>git submodule</em> commands are not affected by this setting.
+ By default this is set to untracked so that any untracked
+ submodules are ignored.
</p>
</dd>
<dt class="hdlist1">
@@ -4463,11 +4491,66 @@ diff.guitool <div class="ulist"><ul>
<li>
<p>
+araxis
+</p>
+</li>
+<li>
+<p>
+bc
+</p>
+</li>
+<li>
+<p>
bc3
</p>
</li>
<li>
<p>
+bc4
+</p>
+</li>
+<li>
+<p>
+codecompare
+</p>
+</li>
+<li>
+<p>
+deltawalker
+</p>
+</li>
+<li>
+<p>
+diffmerge
+</p>
+</li>
+<li>
+<p>
+diffuse
+</p>
+</li>
+<li>
+<p>
+ecmerge
+</p>
+</li>
+<li>
+<p>
+emerge
+</p>
+</li>
+<li>
+<p>
+examdiff
+</p>
+</li>
+<li>
+<p>
+guiffy
+</p>
+</li>
+<li>
+<p>
gvimdiff
</p>
</li>
@@ -4483,6 +4566,21 @@ gvimdiff3 </li>
<li>
<p>
+kdiff3
+</p>
+</li>
+<li>
+<p>
+kompare
+</p>
+</li>
+<li>
+<p>
+meld
+</p>
+</li>
+<li>
+<p>
nvimdiff
</p>
</li>
@@ -4493,6 +4591,36 @@ nvimdiff2 </li>
<li>
<p>
+nvimdiff3
+</p>
+</li>
+<li>
+<p>
+opendiff
+</p>
+</li>
+<li>
+<p>
+p4merge
+</p>
+</li>
+<li>
+<p>
+smerge
+</p>
+</li>
+<li>
+<p>
+tkdiff
+</p>
+</li>
+<li>
+<p>
+vimdiff
+</p>
+</li>
+<li>
+<p>
vimdiff2
</p>
</li>
@@ -4501,6 +4629,16 @@ vimdiff2 vimdiff3
</p>
</li>
+<li>
+<p>
+winmerge
+</p>
+</li>
+<li>
+<p>
+xxdiff
+</p>
+</li>
</ul></div>
</dd>
<dt class="hdlist1">
@@ -7216,11 +7354,66 @@ merge.guitool <div class="ulist"><ul>
<li>
<p>
+araxis
+</p>
+</li>
+<li>
+<p>
+bc
+</p>
+</li>
+<li>
+<p>
bc3
</p>
</li>
<li>
<p>
+bc4
+</p>
+</li>
+<li>
+<p>
+codecompare
+</p>
+</li>
+<li>
+<p>
+deltawalker
+</p>
+</li>
+<li>
+<p>
+diffmerge
+</p>
+</li>
+<li>
+<p>
+diffuse
+</p>
+</li>
+<li>
+<p>
+ecmerge
+</p>
+</li>
+<li>
+<p>
+emerge
+</p>
+</li>
+<li>
+<p>
+examdiff
+</p>
+</li>
+<li>
+<p>
+guiffy
+</p>
+</li>
+<li>
+<p>
gvimdiff
</p>
</li>
@@ -7236,6 +7429,16 @@ gvimdiff3 </li>
<li>
<p>
+kdiff3
+</p>
+</li>
+<li>
+<p>
+meld
+</p>
+</li>
+<li>
+<p>
nvimdiff
</p>
</li>
@@ -7246,6 +7449,41 @@ nvimdiff2 </li>
<li>
<p>
+nvimdiff3
+</p>
+</li>
+<li>
+<p>
+opendiff
+</p>
+</li>
+<li>
+<p>
+p4merge
+</p>
+</li>
+<li>
+<p>
+smerge
+</p>
+</li>
+<li>
+<p>
+tkdiff
+</p>
+</li>
+<li>
+<p>
+tortoisemerge
+</p>
+</li>
+<li>
+<p>
+vimdiff
+</p>
+</li>
+<li>
+<p>
vimdiff2
</p>
</li>
@@ -7254,6 +7492,16 @@ vimdiff2 vimdiff3
</p>
</li>
+<li>
+<p>
+winmerge
+</p>
+</li>
+<li>
+<p>
+xxdiff
+</p>
+</li>
</ul></div>
</dd>
<dt class="hdlist1">
@@ -9932,7 +10180,7 @@ looks like</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2020-12-08 16:10:07 PST
+ 2021-01-25 15:29:19 PST
</div>
</div>
</body>
|