From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 10 May 2012 17:49:42 +0000 (-0700)
Subject: Merge branch 'fa/maint-config-doc'
X-Git-Tag: v1.7.11-rc0~43
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/1652867c73a193359519ff10217c03f850a76a86?hp=-c

Merge branch 'fa/maint-config-doc'

By Florian Achleitner
* fa/maint-config-doc:
Documentation/git-config: describe and clarify "--local <file>" option
---

1652867c73a193359519ff10217c03f850a76a86
diff --combined Documentation/git-config.txt
index 81b03982e3,800a5cd79d..3f5d216a09
--- a/Documentation/git-config.txt
+++ b/Documentation/git-config.txt
@@@ -44,11 -44,15 +44,15 @@@ a "true" or "false" string for bool), o
  path expansion (see '--path' below).  If no type specifier is passed, no
  checks or transformations are performed on the value.
  
- The file-option can be one of '--system', '--global' or '--file'
- which specify where the values will be read from or written to.
- The default is to assume the config file of the current repository,
- .git/config unless defined otherwise with GIT_DIR and GIT_CONFIG
- (see <<FILES>>).
+ When reading, the values are read from the system, global and
+ repository local configuration files by default, and options
+ '--system', '--global', '--local' and '--file <filename>' can be
+ used to tell the command to read from only that location (see <<FILES>>).
+ 
+ When writing, the new value is written to the repository local
+ configuration file by default, and options '--system', '--global',
+ '--file <filename>' can be used to tell the command to write to
+ that location (you can say '--local' but that is the default).
  
  This command will fail (with exit code ret) if:
  
@@@ -85,11 -89,8 +89,11 @@@ OPTION
  	is not exactly one.
  
  --get-regexp::
 -	Like --get-all, but interprets the name as a regular expression.
 -	Also outputs the key names.
 +	Like --get-all, but interprets the name as a regular expression and
 +	writes out the key names.  Regular expression matching is currently
 +	case-sensitive and done against a canonicalized version of the key
 +	in which section and variable names are lowercased, but subsection
 +	names are not.
  
  --global::
  	For writing options: write to global ~/.gitconfig file rather than
@@@ -181,11 -182,6 +185,11 @@@ See also <<FILES>>
  	Opens an editor to modify the specified config file; either
  	'--system', '--global', or repository (default).
  
 +--includes::
 +--no-includes::
 +	Respect `include.*` directives in config files when looking up
 +	values. Defaults to on.
 +
  [[FILES]]
  FILES
  -----