diff options
author | Junio C Hamano <gitster@pobox.com> | 2020-02-14 20:42:31 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-02-14 20:42:31 (GMT) |
commit | 6e69042e26ebf17f3eda60ec90c39ee179e9bc53 (patch) | |
tree | 21bb557594e480149fedd9b48d97fdf82764cf68 /Documentation/git-commit-tree.txt | |
parent | 650ed395be1cfe5d213378402bc3a778b46fb974 (diff) | |
parent | 69e104d70e29060742c75ccdcb6653e23c65f3c3 (diff) | |
download | git-6e69042e26ebf17f3eda60ec90c39ee179e9bc53.zip git-6e69042e26ebf17f3eda60ec90c39ee179e9bc53.tar.gz git-6e69042e26ebf17f3eda60ec90c39ee179e9bc53.tar.bz2 |
Merge branch 'bc/author-committer-doc' into maint
Clarify documentation on committer/author identities.
* bc/author-committer-doc:
doc: provide guidance on user.name format
docs: expand on possible and recommended user config options
doc: move author and committer information to git-commit(1)
Diffstat (limited to 'Documentation/git-commit-tree.txt')
-rw-r--r-- | Documentation/git-commit-tree.txt | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/Documentation/git-commit-tree.txt b/Documentation/git-commit-tree.txt index 4b90b9c..ec15ee8 100644 --- a/Documentation/git-commit-tree.txt +++ b/Documentation/git-commit-tree.txt @@ -69,7 +69,6 @@ OPTIONS Do not GPG-sign commit, to countermand a `--gpg-sign` option given earlier on the command line. - Commit Information ------------------ @@ -79,26 +78,6 @@ A commit encapsulates: - author name, email and date - committer name and email and the commit time. -While parent object ids are provided on the command line, author and -committer information is taken from the following environment variables, -if set: - - GIT_AUTHOR_NAME - GIT_AUTHOR_EMAIL - GIT_AUTHOR_DATE - GIT_COMMITTER_NAME - GIT_COMMITTER_EMAIL - GIT_COMMITTER_DATE - -(nb "<", ">" and "\n"s are stripped) - -In case (some of) these environment variables are not set, the information -is taken from the configuration items user.name and user.email, or, if not -present, the environment variable EMAIL, or, if that is not set, -system user name and the hostname used for outgoing mail (taken -from `/etc/mailname` and falling back to the fully qualified hostname when -that file does not exist). - A commit comment is read from stdin. If a changelog entry is not provided via "<" redirection, 'git commit-tree' will just wait for one to be entered and terminated with ^D. @@ -117,6 +96,7 @@ FILES SEE ALSO -------- linkgit:git-write-tree[1] +linkgit:git-commit[1] GIT --- |