summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-03-31 16:30:49 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-03-31 16:30:49 -0700
commit76bc28a3bb45344f2796976aeaca19805588c52b (patch)
treec1f3a0982c7fca79e8ec221af59745b08a5e55b5
parentMerge branch 'hs/simplify-bit-setting-in-fsck-tree' (diff)
parentconfig.txt: third-party tools may and do use their own variables (diff)
downloadtgif-76bc28a3bb45344f2796976aeaca19805588c52b.tar.xz
Merge branch 'ca/doc-config-third-party'
* ca/doc-config-third-party: config.txt: third-party tools may and do use their own variables
-rw-r--r--Documentation/config.txt9
1 files changed, 7 insertions, 2 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 73c8973aae..c415aadbbc 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -131,8 +131,13 @@ Variables
Note that this list is non-comprehensive and not necessarily complete.
For command-specific variables, you will find a more detailed description
-in the appropriate manual page. You will find a description of non-core
-porcelain configuration variables in the respective porcelain documentation.
+in the appropriate manual page.
+
+Other git-related tools may and do use their own variables. When
+inventing new variables for use in your own tool, make sure their
+names do not conflict with those that are used by Git itself and
+other popular tools, and describe them in your documentation.
+
advice.*::
These variables control various optional help messages designed to