diff options
| author | Matthieu Moy <Matthieu.Moy@imag.fr> | 2013-02-14 16:36:54 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-02-15 09:05:55 -0800 |
| commit | c0179c0d33b0fc3c8ad30246eece220e0442fb6e (patch) | |
| tree | 228fcbdf499359a697d4da3fcb8125b1a6e09003 | |
| parent | d32805dce7bdc45a3e4045e999fc5d56e3b46a82 (diff) | |
| download | git-c0179c0d33b0fc3c8ad30246eece220e0442fb6e.tar.gz git-c0179c0d33b0fc3c8ad30246eece220e0442fb6e.tar.xz | |
git.txt: update description of the configuration mechanism
The old Git version where it appeared is now useful only to historians,
not to normal users. Also, the text was mentioning only the per-repo
config file, but this is a good place to teach that customization can
also be made per-user.
While at it, remove a now-defunct e-mail from an example.
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/git.txt | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/Documentation/git.txt b/Documentation/git.txt index c7f211e81..4fe62df28 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -530,10 +530,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: ------------ # @@ -548,13 +547,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 |