From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 25 Aug 2016 20:55:07 +0000 (-0700)
Subject: Merge branch 'dg/document-git-c-in-git-config-doc'
X-Git-Tag: v2.10.0-rc2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a8998453bebd7a4d620c78773917f1189ff4e672;p=thirdparty%2Fgit.git

Merge branch 'dg/document-git-c-in-git-config-doc'

The "git -c var[=val] cmd" facility to append a configuration
variable definition at the end of the search order was described in
git(1) manual page, but not in git-config(1), which was more likely
place for people to look for when they ask "can I make a one-shot
override, and if so how?"

* dg/document-git-c-in-git-config-doc:
  doc: mention `git -c` in git-config(1)
---

a8998453bebd7a4d620c78773917f1189ff4e672
diff --cc Documentation/git-config.txt
index f163113a6f,636b3eb478..83f86b9231
--- a/Documentation/git-config.txt
+++ b/Documentation/git-config.txt
@@@ -263,13 -263,16 +263,16 @@@ The files are read in the order given a
  precedence over values read earlier.  When multiple values are taken then all
  values of a key from all files will be used.
  
+ You may override individual configuration parameters when running any git
+ command by using the `-c` option. See linkgit:git[1] for details.
+ 
  All writing options will per default write to the repository specific
 -configuration file. Note that this also affects options like '--replace-all'
 -and '--unset'. *'git config' will only ever change one file at a time*.
 +configuration file. Note that this also affects options like `--replace-all`
 +and `--unset`. *'git config' will only ever change one file at a time*.
  
  You can override these rules either by command-line options or by environment
 -variables. The '--global' and the '--system' options will limit the file used
 -to the global or system-wide file respectively. The GIT_CONFIG environment
 +variables. The `--global` and the `--system` options will limit the file used
 +to the global or system-wide file respectively. The `GIT_CONFIG` environment
  variable has a similar effect, but you can specify any filename you want.