summaryrefslogtreecommitdiffstats
path: root/git.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-02-18 16:41:17 -0800
committerJunio C Hamano <gitster@pobox.com>2013-02-18 16:41:17 -0800
commit2da4ac450ace11825c8905d13c97e9d71a6bfc45 (patch)
tree6103c9d40ef94537f8c037234ff944b880ae5579 /git.html
parent80ad00d04ac0573df6d945f3b7741ceadfdf7bb2 (diff)
downloadgit-htmldocs-2da4ac450ace11825c8905d13c97e9d71a6bfc45.tar.gz
Autogenerated HTML docs for v1.8.2-rc0-16-g20a59
Diffstat (limited to 'git.html')
-rw-r--r--git.html13
1 files changed, 6 insertions, 7 deletions
diff --git a/git.html b/git.html
index 35626cb55..4eb59f174 100644
--- a/git.html
+++ b/git.html
@@ -2143,10 +2143,9 @@ users typically do not use them directly.</p></div>
<div class="sect1">
<h2 id="_configuration_mechanism">Configuration Mechanism</h2>
<div class="sectionbody">
-<div class="paragraph"><p>Starting from 0.99.9 (actually mid 0.99.8.GIT), <code>.git/config</code> file
-is used to hold per-repository configuration options. It is a
-simple text file modeled after <code>.ini</code> format familiar to some
-people. Here is an example:</p></div>
+<div class="paragraph"><p>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:</p></div>
<div class="listingblock">
<div class="content">
<pre><code>#
@@ -2161,11 +2160,11 @@ people. Here is an example:</p></div>
; user identity
[user]
name = "Junio C Hamano"
- email = "junkio@twinsun.com"</code></pre>
+ email = "gitster@pobox.com"</code></pre>
</div></div>
<div class="paragraph"><p>Various commands read from the configuration file and adjust
their operation accordingly. See <a href="git-config.html">git-config(1)</a> for a
-list.</p></div>
+list and more details about the configuration mechanism.</p></div>
</div>
</div>
<div class="sect1">
@@ -2734,7 +2733,7 @@ subscribed to the list to send a message there.</p></div>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2013-02-05 21:07:26 PST
+Last updated 2013-02-18 16:40:41 PST
</div>
</div>
</body>