On Mon, Jan 20, 2020 at 05:33:39PM +0000, brian m. carlson wrote: > diff --git a/Documentation/git-commit-tree.txt b/Documentation/git-commit-tree.txt > index 4b90b9c12a..adc2e0d4b7 100644 > --- a/Documentation/git-commit-tree.txt > +++ b/Documentation/git-commit-tree.txt > @@ -42,6 +42,10 @@ tend to just write the result to the file that is pointed at by > `.git/HEAD`, so that we can always see what the last committed > state was. > > +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. > + > OPTIONS > ------- > <tree>:: This text got moved up, which kind of make sense to me, but... > @@ -79,26 +82,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. it stayed here, so now it's duplicated. Should the old one be dropped? Or is moving the new text a leftover mistake from rebasing (IIRC, in your original you dropped this whole "here's how commits work" section). Other than that, the patch looks good to me. -Peff
