summaryrefslogtreecommitdiffstats
path: root/git.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-10-03 16:10:59 +0900
committerJunio C Hamano <gitster@pobox.com>2017-10-03 16:10:59 +0900
commit139b7d1a5a53f1b27057bbb37a7a4a14959f6a79 (patch)
treedf84f1b9ecd85274fdef383894621dab2b08fd5a /git.html
parentef75f377a0a3170ce7d5664cab4a6057d91f59c8 (diff)
downloadgit-htmldocs-139b7d1a5a53f1b27057bbb37a7a4a14959f6a79.tar.gz
Autogenerated HTML docs for v2.14.2-746-g8fb8a9
Diffstat (limited to 'git.html')
-rw-r--r--git.html28
1 files changed, 25 insertions, 3 deletions
diff --git a/git.html b/git.html
index e1e02ce59..9a2d5a0b3 100644
--- a/git.html
+++ b/git.html
@@ -836,8 +836,8 @@ git --git-dir=c/a.git --work-tree=c/b status</code></pre>
<div class="paragraph"><p>Note that omitting the <code>=</code> in <code>git -c foo.bar ...</code> is allowed and sets
<code>foo.bar</code> to the boolean true value (just like <code>[foo]bar</code> would in a
config file). Including the equals but with an empty value (like <code>git -c
-foo.bar= ...</code>) sets <code>foo.bar</code> to the empty string which ` git config
---bool` will convert to <code>false</code>.</p></div>
+foo.bar= ...</code>) sets <code>foo.bar</code> to the empty string which <code>git config
+--bool</code> will convert to <code>false</code>.</p></div>
</dd>
<dt class="hdlist1">
--exec-path[=&lt;path&gt;]
@@ -1002,6 +1002,15 @@ foo.bar= ...</code>) sets <code>foo.bar</code> to the empty string which ` git c
the <code>GIT_ICASE_PATHSPECS</code> environment variable to <code>1</code>.
</p>
</dd>
+<dt class="hdlist1">
+--no-optional-locks
+</dt>
+<dd>
+<p>
+ Do not perform optional operations that require locks. This is
+ equivalent to setting the <code>GIT_OPTIONAL_LOCKS</code> to <code>0</code>.
+</p>
+</dd>
</dl></div>
</div>
</div>
@@ -2939,6 +2948,19 @@ of clones and fetches.</p></div>
<a href="git-config.html">git-config(1)</a> for more details.
</p>
</dd>
+<dt class="hdlist1">
+<code>GIT_OPTIONAL_LOCKS</code>
+</dt>
+<dd>
+<p>
+ If set to <code>0</code>, Git will complete any requested operation without
+ performing any optional sub-operations that require taking a lock.
+ For example, this will prevent <code>git status</code> from refreshing the
+ index as a side effect. This is useful for processes running in
+ the background which do not want to cause lock contention with
+ other operations on the repository. Defaults to <code>1</code>.
+</p>
+</dd>
</dl></div>
</div>
</div>
@@ -3047,7 +3069,7 @@ subscribed to the list to send a message there.</p></div>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2017-08-23 14:56:20 PDT
+Last updated 2017-10-03 16:10:36 JST
</div>
</div>
</body>