diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-02-18 16:04:58 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-02-18 16:04:58 -0800 |
| commit | 48050fbe15a7266fffcf06c44288761217bb74dd (patch) | |
| tree | 9ea3e19c652723f4ca6fbded102e281b62c018d5 | |
| parent | ce209d0c72677cce41c61bfc30a82f468df804ed (diff) | |
| parent | c0179c0d33b0fc3c8ad30246eece220e0442fb6e (diff) | |
| download | git-48050fbe15a7266fffcf06c44288761217bb74dd.tar.gz git-48050fbe15a7266fffcf06c44288761217bb74dd.tar.xz | |
Merge branch 'mm/config-intro-in-git-doc'
* 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 0b681d9a1..2d975e3b0 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 |