From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 17 May 2016 21:38:23 +0000 (-0700)
Subject: Merge branch 'bn/config-doc-tt-varnames'
X-Git-Tag: v2.9.0-rc0~36
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=34698baa5bad6acc2e8d699a2a6ceb6ff6cede50;p=git

Merge branch 'bn/config-doc-tt-varnames'

Doc formatting fixes.

* bn/config-doc-tt-varnames:
  config: consistently format $variables in monospaced font
---

34698baa5bad6acc2e8d699a2a6ceb6ff6cede50
diff --cc Documentation/config.txt
index b174d40565,2633b82124..e718410350
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -624,26 -615,9 +624,26 @@@ core.attributesFile:
  	'.git/info/attributes', Git looks into this file for attributes
  	(see linkgit:gitattributes[5]). Path expansions are made the same
  	way as for `core.excludesFile`. Its default value is
- 	$XDG_CONFIG_HOME/git/attributes. If $XDG_CONFIG_HOME is either not
- 	set or empty, $HOME/.config/git/attributes is used instead.
+ 	`$XDG_CONFIG_HOME/git/attributes`. If `$XDG_CONFIG_HOME` is either not
+ 	set or empty, `$HOME/.config/git/attributes` is used instead.
  
 +core.hooksPath::
 +	By default Git will look for your hooks in the
 +	'$GIT_DIR/hooks' directory. Set this to different path,
 +	e.g. '/etc/git/hooks', and Git will try to find your hooks in
 +	that directory, e.g. '/etc/git/hooks/pre-receive' instead of
 +	in '$GIT_DIR/hooks/pre-receive'.
 ++
 +The path can be either absolute or relative. A relative path is
 +taken as relative to the directory where the hooks are run (see
 +the "DESCRIPTION" section of linkgit:githooks[5]).
 ++
 +This configuration variable is useful in cases where you'd like to
 +centrally configure your Git hooks instead of configuring them on a
 +per-repository basis, or as a more flexible and centralized
 +alternative to having an `init.templateDir` where you've changed
 +default hooks.
 +
  core.editor::
  	Commands such as `commit` and `tag` that lets you edit
  	messages by launching an editor uses the value of this
@@@ -1491,22 -1455,14 +1491,22 @@@ grep.extendedRegexp:
  	option is ignored when the 'grep.patternType' option is set to a value
  	other than 'default'.
  
 +grep.threads::
 +	Number of grep worker threads to use.
 +	See `grep.threads` in linkgit:git-grep[1] for more information.
 +
 +grep.fallbackToNoIndex::
 +	If set to true, fall back to git grep --no-index if git grep
 +	is executed outside of a git repository.  Defaults to false.
 +
  gpg.program::
- 	Use this custom program instead of "gpg" found on $PATH when
+ 	Use this custom program instead of "`gpg`" found on `$PATH` when
  	making or verifying a PGP signature. The program must support the
  	same command-line interface as GPG, namely, to verify a detached
- 	signature, "gpg --verify $file - <$signature" is run, and the
+ 	signature, "`gpg --verify $file - <$signature`" is run, and the
  	program is expected to signal a good signature by exiting with
  	code 0, and to generate an ASCII-armored detached signature, the
- 	standard input of "gpg -bsau $key" is fed with the contents to be
+ 	standard input of "`gpg -bsau $key`" is fed with the contents to be
  	signed, and the program is expected to send the result to its
  	standard output.