Re: [PATCH v4 1/5] doc: move author and committer information to git-commit(1)
From: Junio C Hamano <hidden>
Date: 2020-01-21 22:23:46
"brian m. carlson" [off-list ref] writes:
quoted hunk
diff --git a/Documentation/config/user.txt b/Documentation/config/user.txt index 0557cbbceb..a1f80e823c 100644 --- a/Documentation/config/user.txt +++ b/Documentation/config/user.txt@@ -13,7 +13,7 @@ committer.email:: 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. + See linkgit:git-commit[1] for more information.
Makes sense---it is consistent with the goal of making the documentation of "git commit" Porcelain the central place for authorship and committer information.
quoted hunk
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.
This is copied from the end of the "commit information" section, without the original getting removed (see the post-context of the hunk that begins at l.79/l.82). Intended? I haven't seen anybody use the phrase "commit comment" in the reviews on this list for long time; the phrase somehow feels outdated. The pretty formats section in "git log --help" calls this "commit message". "log message" may also be more common.
quoted hunk
@@ -69,7 +73,6 @@ OPTIONS Do not GPG-sign commit, to countermand a `--gpg-sign` option given earlier on the command line. - Commit Information ------------------@@ -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 -... -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 +100,7 @@ FILES