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

diff --git a/Documentation/git-commit-tree.txt b/Documentation/git-commit-tree.txt
index eb8ee9999eebce4baf5008e604acfee4ccda6bd8..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>::