Merge branch 'rr/maint-tilde-markup-in-doc'

* rr/maint-tilde-markup-in-doc:
  config doc: quote paths, fixing tilde-interpretation
maint
Junio C Hamano 2013-07-31 12:38:15 -07:00
commit 5ecc4b53f7
1 changed files with 14 additions and 12 deletions

View File

@ -96,29 +96,31 @@ OPTIONS
names are not. names are not.


--global:: --global::
For writing options: write to global ~/.gitconfig file rather than For writing options: write to global `~/.gitconfig` file
the repository .git/config, write to $XDG_CONFIG_HOME/git/config file rather than the repository `.git/config`, write to
if this file exists and the ~/.gitconfig file doesn't. `$XDG_CONFIG_HOME/git/config` file if this file exists and the
`~/.gitconfig` file doesn't.
+ +
For reading options: read only from global ~/.gitconfig and from For reading options: read only from global `~/.gitconfig` and from
$XDG_CONFIG_HOME/git/config rather than from all available files. `$XDG_CONFIG_HOME/git/config` rather than from all available files.
+ +
See also <<FILES>>. See also <<FILES>>.


--system:: --system::
For writing options: write to system-wide $(prefix)/etc/gitconfig For writing options: write to system-wide
rather than the repository .git/config. `$(prefix)/etc/gitconfig` rather than the repository
`.git/config`.
+ +
For reading options: read only from system-wide $(prefix)/etc/gitconfig For reading options: read only from system-wide `$(prefix)/etc/gitconfig`
rather than from all available files. rather than from all available files.
+ +
See also <<FILES>>. See also <<FILES>>.


--local:: --local::
For writing options: write to the repository .git/config file. For writing options: write to the repository `.git/config` file.
This is the default behavior. This is the default behavior.
+ +
For reading options: read only from the repository .git/config rather than For reading options: read only from the repository `.git/config` rather than
from all available files. from all available files.
+ +
See also <<FILES>>. See also <<FILES>>.
@ -218,9 +220,9 @@ $(prefix)/etc/gitconfig::


$XDG_CONFIG_HOME/git/config:: $XDG_CONFIG_HOME/git/config::
Second user-specific configuration file. If $XDG_CONFIG_HOME is not set Second user-specific configuration file. If $XDG_CONFIG_HOME is not set
or empty, $HOME/.config/git/config will be used. Any single-valued or empty, `$HOME/.config/git/config` will be used. Any single-valued
variable set in this file will be overwritten by whatever is in variable set in this file will be overwritten by whatever is in
~/.gitconfig. It is a good idea not to create this file if `~/.gitconfig`. It is a good idea not to create this file if
you sometimes use older versions of Git, as support for this you sometimes use older versions of Git, as support for this
file was added fairly recently. file was added fairly recently.