diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-06-24 13:48:55 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-06-24 13:48:55 -0700 |
| commit | 869577e5fe8d4307dd39d2751cf3c5a1896d3426 (patch) | |
| tree | 4fbeb863e866ff7026f78646aa49eabc384f5281 | |
| parent | Merge branch 'jk/mergetool-lib-refactor' (diff) | |
| parent | config: Add description of --local option (diff) | |
| download | tgif-869577e5fe8d4307dd39d2751cf3c5a1896d3426.tar.xz | |
Merge branch 'nk/config-local-doc'
* nk/config-local-doc:
config: Add description of --local option
| -rw-r--r-- | Documentation/git-config.txt | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt index d88a6fcb29..19a7be0856 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. |