From: Matthieu Moy Date: Thu, 14 Feb 2013 15:36:54 GMT Subject: [PATCH] git.txt: update description of the configuration mechanism Message-ID: <1360856214-934-1-git-send-email-Matthieu.Moy@imag.fr> The old Git version where it appeared is not useful only to historians, not to normal users. Also, the text was mentioning only the per-repo config file, so add a mention of ~/.gitconfig. Describing in details the system-wide, XDG and all would be counter-productive here, so reword the description of the link to git-config to make it clear that it is not only a list of configuration options. Signed-off-by: Matthieu Moy --- Documentation/git.txt | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Documentation/git.txt b/Documentation/git.txt index 0b681d9..e332947 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -535,10 +535,11 @@ include::cmds-purehelpers.txt[] Configuration Mechanism ----------------------- -Starting from 0.99.9 (actually mid 0.99.8.GIT), `.git/config` file -is used to hold per-repository configuration options. It is a -simple text file modeled after `.ini` format familiar to some -people. Here is an example: +Git uses a simple text file format modeled after `.ini` format +familiar to some people to store its configuration. The `.git/config` +file is used to hold per-repository configuration options, and +per-user configuration can be stored in a `~/.gitconfig` file. +Here is an example: ------------ # @@ -559,7 +560,7 @@ people. Here is an example: Various commands read from the configuration file and adjust their operation accordingly. See linkgit:git-config[1] for a -list. +list and more details about the configuration mechanism. Identifier Terminology -- 1.8.1.3.572.g35e1b60