Merge branch 'nk/config-local-doc' into maint

* nk/config-local-doc:
  config: Add description of --local option
This commit is contained in:
Junio C Hamano 2013-07-21 22:51:39 -07:00
commit b6538a0b4e

View File

@ -114,6 +114,15 @@ rather than from all available files.
+
See also <<FILES>>.
--local::
For writing options: write to the repository .git/config file.
This is the default behavior.
+
For reading options: read only from the repository .git/config rather than
from all available files.
+
See also <<FILES>>.
-f config-file::
--file config-file::
Use the given config file instead of the one specified by GIT_CONFIG.