Skip to content

Commit c0179c0

Browse files
moygitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent d32805d commit c0179c0

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

Documentation/git.txt

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -530,10 +530,9 @@ include::cmds-purehelpers.txt[]
530530
Configuration Mechanism
531531
-----------------------
532532

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:
537536

538537
------------
539538
#
@@ -548,13 +547,13 @@ people. Here is an example:
548547
; user identity
549548
[user]
550549
name = "Junio C Hamano"
551-
email = "junkio@twinsun.com"
550+
email = "gitster@pobox.com"
552551

553552
------------
554553

555554
Various commands read from the configuration file and adjust
556555
their operation accordingly. See linkgit:git-config[1] for a
557-
list.
556+
list and more details about the configuration mechanism.
558557

559558

560559
Identifier Terminology

0 commit comments

Comments
 (0)