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

diff --git a/Documentation/git-commit-tree.txt b/Documentation/git-commit-tree.txt
index ff73286509782bf3c7d6168066358b02830db797..6d5a04c83b6461396b44b3972a539eaae6368a19 100644 (file)
--- a/Documentation/git-commit-tree.txt
+++ b/Documentation/git-commit-tree.txt
@@ -10,7 +10,7 @@ SYNOPSIS
 --------
 [verse]
 'git commit-tree' <tree> [(-p <parent>)...] < changelog
-'git commit-tree' <tree> [(-p <parent>)...] [(-m <message>)...] [(-F <file>)...]
+'git commit-tree' [(-p <parent>)...] [(-m <message>)...] [(-F <file>)...] <tree>
 
 DESCRIPTION
 -----------