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>
Matthieu Moy committed
Feb 14, 2013 at 16:36 UTC
c0179c0d33b0fc3c8ad30246eece220e0442fb6e
1 file changed
+5
-6
Documentation/git.txt
+5
-6
@@ -530,10 +530,9 @@ include::cmds-purehelpers.txt[]
530
Configuration Mechanism
531
-----------------------
532
533
-Starting from 0.99.9 (actually mid 0.99.8.GIT), `.git/config` file
534
-is used to hold per-repository configuration options. It is a
535
-simple text file modeled after `.ini` format familiar to some
536
-people. Here is an example:
533
+Git uses a simple text format to store customizations that are per
534
+repository and are per user. Such a configuration file may look
535
+like this:
536
537
------------
538
#
@@ -548,13 +547,13 @@ people. Here is an example:
547
; user identity
548
[user]
549
name = "Junio C Hamano"
551
- email = "junkio@twinsun.com"
550
+ email = "gitster@pobox.com"
551
552
------------
553
554
Various commands read from the configuration file and adjust
555
their operation accordingly. See linkgit:git-config[1] for a
557
-list.
556
+list and more details about the configuration mechanism.
557
558
559
Identifier Terminology