diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-10-21 17:16:04 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-10-21 17:16:10 -0700 |
| commit | d4c436975214d8f94d38f9be0ef709b4714fc821 (patch) | |
| tree | ae0ecf02aedd1340a02cb3d9e9b479629e8dcd70 /builtin/commit-tree.c | |
| parent | 1bb28d87e1d8897db662f48455d369860758fbdd (diff) | |
| parent | 8a90438506d3b7c8ef8bd802b7ed10c1f12da1d0 (diff) | |
| download | git-d4c436975214d8f94d38f9be0ef709b4714fc821.tar.gz | |
Sync with 1.7.3.2
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/commit-tree.c')
| -rw-r--r-- | builtin/commit-tree.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/commit-tree.c b/builtin/commit-tree.c index 732f8952bb..d083795e26 100644 --- 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) { |