branch: update output to include worktree info
[gitweb.git] / Documentation / config / user.txt
index b5b2ba1199c98aaa9bbe9c74ce72c9f9dcb41f82..0557cbbceb8159148e8d0e7ab4771a8f53a67c0a 100644 (file)
@@ -1,12 +1,19 @@
-user.email::
-       Your email address to be recorded in any newly created commits.
-       Can be overridden by the `GIT_AUTHOR_EMAIL`, `GIT_COMMITTER_EMAIL`, and
-       `EMAIL` environment variables.  See linkgit:git-commit-tree[1].
-
 user.name::
-       Your full name to be recorded in any newly created commits.
-       Can be overridden by the `GIT_AUTHOR_NAME` and `GIT_COMMITTER_NAME`
-       environment variables.  See linkgit:git-commit-tree[1].
+user.email::
+author.name::
+author.email::
+committer.name::
+committer.email::
+       The `user.name` and `user.email` variables determine what ends
+       up in the `author` and `committer` field of commit
+       objects.
+       If you need the `author` or `committer` to be different, the
+       `author.name`, `author.email`, `committer.name` or
+       `committer.email` variables can be set.
+       Also, all of these can be overridden by the `GIT_AUTHOR_NAME`,
+       `GIT_AUTHOR_EMAIL`, `GIT_COMMITTER_NAME`,
+       `GIT_COMMITTER_EMAIL` and `EMAIL` environment variables.
+       See linkgit:git-commit-tree[1] for more information.
 
 user.useConfigOnly::
        Instruct Git to avoid trying to guess defaults for `user.email`