summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-07-21 22:51:39 -0700
committerJunio C Hamano <gitster@pobox.com>2013-07-21 22:51:39 -0700
commitb6538a0b4eee113d207961bacc1abb6ac5b2e661 (patch)
treefeb44f3e3a4fe1e51b97b57abbe2b0e4405044ec
parenteac00c508df21f6675c07bbc559348eddd0fdd73 (diff)
parent560d4b86abc547dfb10b116ab99c800d68ae8849 (diff)
downloadgit-b6538a0b4eee113d207961bacc1abb6ac5b2e661.tar.gz
Merge branch 'nk/config-local-doc' into maint
* nk/config-local-doc: config: Add description of --local option
-rw-r--r--Documentation/git-config.txt9
1 files changed, 9 insertions, 0 deletions
diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt
index 606f00c3b8..fbad05e46f 100644
--- a/Documentation/git-config.txt
+++ b/Documentation/git-config.txt
@@ -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.