cvsimport: introduce -P <cvsps-output-file> option

diff --git a/Documentation/git-commit-tree.txt b/Documentation/git-commit-tree.txt
index d9b0ab07170160dda74512843bd15e9ef350a5a5..b64cd6a84b7f08164b55445999a12460a3d3c52c 100644 (file)
--- a/Documentation/git-commit-tree.txt
+++ b/Documentation/git-commit-tree.txt
@@ -48,8 +48,8 @@ A commit encapsulates:
 - 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 using the
-following environment variables.
+provide author and committer info. This can be overridden by
+either `.git/config` file, or using the following environment variables.
 
        GIT_AUTHOR_NAME
        GIT_AUTHOR_EMAIL
@@ -59,10 +59,17 @@ following environment variables.
 
 (nb "<", ">" and "\n"s are stripped)
 
+In `.git/config` file, the following items are used:
+
+       [user]
+               name = "Your Name"
+               email = "your@email.address.xz"
+
 A commit comment is read from stdin (max 999 chars). If a changelog
 entry is not provided via "<" redirection, "git-commit-tree" will just wait
 for one to be entered and terminated with ^D.
 
+
 Diagnostics
 -----------
 You don't exist. Go away!::