diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-02-25 08:04:17 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-02-25 08:04:18 -0800 |
| commit | 5cc5f09b7b12fa428ecdc3a082d77dc37c78fd3b (patch) | |
| tree | 1a0e792ebe5991bb953b264d38a8ed26e5021ae1 | |
| parent | Merge branch 'da/p4merge-mktemp-fix' into maint (diff) | |
| parent | git.txt: update description of the configuration mechanism (diff) | |
| download | tgif-5cc5f09b7b12fa428ecdc3a082d77dc37c78fd3b.tar.xz | |
Merge branch 'mm/config-intro-in-git-doc' into maint
* mm/config-intro-in-git-doc:
git.txt: update description of the configuration mechanism
| -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 da0115f3d0..cbac7711ea 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -531,10 +531,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: ------------ # @@ -549,13 +548,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 |