Merge branch 'cm/diff-check-at-eol' into maint

diff --git a/builtin/commit-tree.c b/builtin/commit-tree.c
index 87f0591c2f68a03e06c73b352282426b803450ba..e06573920f461229717b885e291c76831f87e428 100644 (file)
--- a/builtin/commit-tree.c
+++ b/builtin/commit-tree.c
@@ -9,7 +9,7 @@
 #include "builtin.h"
 #include "utf8.h"
 
-static const char commit_tree_usage[] = "git commit-tree <sha1> [-p <sha1>]* < changelog";
+static const char commit_tree_usage[] = "git commit-tree <sha1> [(-p <sha1>)...] < changelog";
 
 static void new_parent(struct commit *parent, struct commit_list **parents_p)
 {