Merge refs/heads/portable from http://www.cs.berkeley.edu/~ejr/gits/git.git

diff --git a/Documentation/git-commit-tree.txt b/Documentation/git-commit-tree.txt
index 5552050ac1dded1e20660264763c20f237c42233..55366688136010ff079a502c99a6af9e9b12dc13 100644 (file)
--- a/Documentation/git-commit-tree.txt
+++ b/Documentation/git-commit-tree.txt
@@ -64,7 +64,18 @@ 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
 
-see also: link:git-write-tree.html[git-write-tree]
+Diagnostics
+-----------
+You don't exist. Go away!::
+    The passwd(5) gecos field couldn't be read
+Your parents must have hated you!::
+    The password(5) gecos field is longer than a giant static buffer.
+Your sysadmin must hate you!::
+    The password(5) name field is longer than a giant static buffer.
+
+See Also
+--------
+link:git-write-tree.html[git-write-tree]
 
 
 Author