From: Junio C Hamano Date: Mon, 25 Feb 2013 16:04:17 +0000 (-0800) Subject: Merge branch 'mm/config-intro-in-git-doc' into maint X-Git-Tag: v1.8.2-rc1~2^2~2 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/5cc5f09b7b12fa428ecdc3a082d77dc37c78fd3b?hp=-c Merge branch 'mm/config-intro-in-git-doc' into maint * mm/config-intro-in-git-doc: git.txt: update description of the configuration mechanism --- 5cc5f09b7b12fa428ecdc3a082d77dc37c78fd3b diff --combined Documentation/git.txt index da0115f3d0,4fe62df28e..cbac7711ea --- a/Documentation/git.txt +++ b/Documentation/git.txt @@@ -43,10 -43,9 +43,10 @@@ unreleased) version of git, that is ava branch of the `git.git` repository. Documentation for older releases are available here: -* link:v1.8.1.3/git.html[documentation for release 1.8.1.3] +* link:v1.8.1.4/git.html[documentation for release 1.8.1.4] * release notes for + link:RelNotes/1.8.1.4.txt[1.8.1.4], link:RelNotes/1.8.1.3.txt[1.8.1.3], link:RelNotes/1.8.1.2.txt[1.8.1.2], link:RelNotes/1.8.1.1.txt[1.8.1.1], @@@ -531,10 -530,9 +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 -547,13 +548,13 @@@ ; 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