diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-10-21 16:26:42 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-10-21 16:26:42 -0700 |
| commit | f7bff60de95951d2c82601350cb3771b347e83ee (patch) | |
| tree | 5c0e747a86d4990b4e5b7176cec670de620dabe8 /builtin/commit-tree.c | |
| parent | 75a2f301676aefb85c4f67da613cad2405e77927 (diff) | |
| parent | d0bb13663000be47d83cbe53b6c4bdc8835625cb (diff) | |
| download | git-f7bff60de95951d2c82601350cb3771b347e83ee.tar.gz | |
Merge branch 'sn/doc-opt-notation' into maint
* sn/doc-opt-notation:
Fix {update,checkout}-index usage strings
Put a space between `<' and argument in pack-objects usage string
Remove stray quotes in --pretty and --format documentation
Use parentheses and `...' where appropriate
Fix odd markup in --diff-filter documentation
Use angles for placeholders consistently
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 87f0591c2f..e06573920f 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) { |