X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-commit-tree.txt;h=170803a6d0ce2e37a3d2bea8199ec7fb5308b261;hb=325566cc5d14a409bdbc76aac50344294961f143;hp=9586b9729151efd64b3cf5f5d511dd39b664e08e;hpb=f8db7884286232274c8e7c7d82a35a2478b097d3;p=git.git diff --git a/Documentation/git-commit-tree.txt b/Documentation/git-commit-tree.txt index 9586b9729..170803a6d 100644 --- a/Documentation/git-commit-tree.txt +++ b/Documentation/git-commit-tree.txt @@ -13,7 +13,7 @@ SYNOPSIS DESCRIPTION ----------- This is usually not what an end user wants to run directly. See -gitlink:git-commit[1] instead. +linkgit:git-commit[1] instead. Creates a new commit object based on the provided tree object and emits the new commit object id on stdout. If no parent is given then @@ -51,9 +51,9 @@ A commit encapsulates: - author name, email and date - committer name and email and the commit time. -If not provided, "git-commit-tree" uses your name, hostname and domain to -provide author and committer info. This can be overridden by -either `.git/config` file, or using the following environment variables. +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 @@ -65,14 +65,11 @@ either `.git/config` file, or using the following environment variables. (nb "<", ">" and "\n"s are stripped) -In `.git/config` file, the following items are used for GIT_AUTHOR_NAME and -GIT_AUTHOR_EMAIL: +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, system user name and fully qualified hostname. - [user] - name = "Your Name" - email = "your@email.address.xz" - -A commit comment is read from stdin (max 999 chars). If a changelog +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. @@ -93,7 +90,7 @@ include::i18n.txt[] See Also -------- -gitlink:git-write-tree[1] +linkgit:git-write-tree[1] Author @@ -106,4 +103,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list