Re: [PATCH] git.txt: update description of the configuration mechanism
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Feb 14, 2013, 17:10 UTC
- Message-ID
- <7v4nhe3joq.fsf@alter.siamese.dyndns.org>
- In-Reply-To
- <vpqzjz6ampm.fsf@grenoble-inp.fr>
Matthieu Moy <Matthieu.Moy@grenoble-inp.fr> writes:
> If the XDG config file ever become the default, then sure, it will have > to be promoted instead of ~/.gitconfig in git.txt (and I'll be all for > it when it's time, even though I can foresee a few flamewars ;-) ), but > I don't think we should do that now.
We are giving an overview to list what things are possible and what words the reader should be familiar with in this part of the manual. The fact that configuration can be done per user and per repository is a relevant thing to know at the conceptual level.
But the exact location of per-user and per-repository configuration files does not matter in this context and is best left to the git-config documentation.
Documentation/git.txt | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/Documentation/git.txt b/Documentation/git.txt index 0b681d9..2d975e3 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -535,10 +535,9 @@ 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 format to store customizations that are per +repository and are per user. Such a configuration file may look +like this: ------------ # @@ -553,13 +552,13 @@ people. Here is an example: ; user identity [user] name = "Junio C Hamano" - email = "junkio@twinsun.com" + email = "gitster@pobox.com" ------------ 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