From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 3 Oct 2017 06:42:50 +0000 (+0900)
Subject: Merge branch 'ad/doc-markup-fix'
X-Git-Tag: v2.15.0-rc0~12
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/8f2733a04bc458d1f2292d5227eb240b0b297862?ds=inline;hp=-c

Merge branch 'ad/doc-markup-fix'

Docfix.

* ad/doc-markup-fix:
doc: correct command formatting
---

8f2733a04bc458d1f2292d5227eb240b0b297862
diff --combined Documentation/git.txt
index f7e603bc82,98b9b46b9e..7a1d629ca0
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@@ -75,7 -75,7 +75,7 @@@ example the following invocations are e
  Note that omitting the `=` in `git -c foo.bar ...` is allowed and sets
  `foo.bar` to the boolean true value (just like `[foo]bar` would in a
  config file). Including the equals but with an empty value (like `git -c
- foo.bar= ...`) sets `foo.bar` to the empty string which ` git config
+ foo.bar= ...`) sets `foo.bar` to the empty string which `git config
  --bool` will convert to `false`.
  
  --exec-path[=<path>]::
@@@ -159,10 -159,6 +159,10 @@@
  	Add "icase" magic to all pathspec. This is equivalent to setting
  	the `GIT_ICASE_PATHSPECS` environment variable to `1`.
  
 +--no-optional-locks::
 +	Do not perform optional operations that require locks. This is
 +	equivalent to setting the `GIT_OPTIONAL_LOCKS` to `0`.
 +
  GIT COMMANDS
  ------------
  
@@@ -701,14 -697,6 +701,14 @@@ of clones and fetches
  	which feed potentially-untrusted URLS to git commands.  See
  	linkgit:git-config[1] for more details.
  
 +`GIT_OPTIONAL_LOCKS`::
 +	If set to `0`, Git will complete any requested operation without
 +	performing any optional sub-operations that require taking a lock.
 +	For example, this will prevent `git status` 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 `1`.
 +
  Discussion[[Discussion]]
  ------------------------