summaryrefslogtreecommitdiffstats
path: root/git-config.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-03-07 12:17:00 +0900
committerJunio C Hamano <gitster@pobox.com>2019-03-07 12:17:00 +0900
commit11f1537a82c84e620d742b3bc4256952defb28df (patch)
tree2923ff40fbf10f29b7eaa506c2deb52e00e08dde /git-config.html
parent9149123b58ede4ca92a71abd3c09e3e2ad205b55 (diff)
downloadgit-htmldocs-11f1537a82c84e620d742b3bc4256952defb28df.tar.gz
Autogenerated HTML docs for v2.21.0-135-g6e0cc
Diffstat (limited to 'git-config.html')
-rw-r--r--git-config.html36
1 files changed, 24 insertions, 12 deletions
diff --git a/git-config.html b/git-config.html
index c6f98cbc1..3f2c69f84 100644
--- a/git-config.html
+++ b/git-config.html
@@ -8867,23 +8867,35 @@ url.&lt;base&gt;.pushInsteadOf
</p>
</dd>
<dt class="hdlist1">
+user.name
+</dt>
+<dt class="hdlist1">
user.email
</dt>
-<dd>
-<p>
- Your email address to be recorded in any newly created commits.
- Can be overridden by the <code>GIT_AUTHOR_EMAIL</code>, <code>GIT_COMMITTER_EMAIL</code>, and
- <code>EMAIL</code> environment variables. See <a href="git-commit-tree.html">git-commit-tree(1)</a>.
-</p>
-</dd>
<dt class="hdlist1">
-user.name
+author.name
+</dt>
+<dt class="hdlist1">
+author.email
+</dt>
+<dt class="hdlist1">
+committer.name
+</dt>
+<dt class="hdlist1">
+committer.email
</dt>
<dd>
<p>
- Your full name to be recorded in any newly created commits.
- Can be overridden by the <code>GIT_AUTHOR_NAME</code> and <code>GIT_COMMITTER_NAME</code>
- environment variables. See <a href="git-commit-tree.html">git-commit-tree(1)</a>.
+ The <code>user.name</code> and <code>user.email</code> variables determine what ends
+ up in the <code>author</code> and <code>committer</code> field of commit
+ objects.
+ If you need the <code>author</code> or <code>committer</code> to be different, the
+ <code>author.name</code>, <code>author.email</code>, <code>committer.name</code> or
+ <code>committer.email</code> variables can be set.
+ Also, all of these can be overridden by the <code>GIT_AUTHOR_NAME</code>,
+ <code>GIT_AUTHOR_EMAIL</code>, <code>GIT_COMMITTER_NAME</code>,
+ <code>GIT_COMMITTER_EMAIL</code> and <code>EMAIL</code> environment variables.
+ See <a href="git-commit-tree.html">git-commit-tree(1)</a> for more information.
</p>
</dd>
<dt class="hdlist1">
@@ -9016,7 +9028,7 @@ looks like</p></div>
<div id="footer">
<div id="footer-text">
Last updated
- 2018-11-13 06:05:48 PST
+ 2018-11-13 23:05:48 JST
</div>
</div>
</body>