Merge branch 'jc/mergetool-tool-help' into maint

diff --git a/Documentation/git-commit-tree.txt b/Documentation/git-commit-tree.txt
index cfb9906bb52f5bd81301e4859759b17ab124cada..6d5a04c83b6461396b44b3972a539eaae6368a19 100644 (file)
--- a/Documentation/git-commit-tree.txt
+++ b/Documentation/git-commit-tree.txt
@@ -45,7 +45,7 @@ OPTIONS
        Each '-p' indicates the id of a parent commit object.
 
 -m <message>::
-       A paragraph in the commig log message. This can be given more than
+       A paragraph in the commit log message. This can be given more than
        once and each <message> becomes its own paragraph.
 
 -F <file>::
@@ -88,15 +88,6 @@ for one to be entered and terminated with ^D.
 
 include::date-formats.txt[]
 
-Diagnostics
------------
-You don't exist. Go away!::
-    The passwd(5) gecos field couldn't be read
-Your parents must have hated you!::
-    The passwd(5) gecos field is longer than a giant static buffer.
-Your sysadmin must hate you!::
-    The passwd(5) name field is longer than a giant static buffer.
-
 Discussion
 ----------