summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-09-08 21:35:56 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-09-08 21:35:56 -0700
commit15a27298fc5b2d8011f0087ab6f03996215971ef (patch)
tree643652089a92d183bc98f3e50f6ba63bf4811d2e /Documentation
parentMerge branch 'js/no-html-bypass-on-windows' into maint (diff)
parentdoc: mention `git -c` in git-config(1) (diff)
downloadtgif-15a27298fc5b2d8011f0087ab6f03996215971ef.tar.xz
Merge branch 'dg/document-git-c-in-git-config-doc' into maint
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)
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-config.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt
index f163113a6f..83f86b9231 100644
--- a/Documentation/git-config.txt
+++ b/Documentation/git-config.txt
@@ -263,6 +263,9 @@ The files are read in the order given above, with last value found taking
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*.