diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-09-16 01:24:58 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-09-16 01:24:58 -0700 |
| commit | 97d7fee2cb068f215a593c6e5623b265db45d3bc (patch) | |
| tree | 6179e15deb7b34d3d2c6236077e7ad8454457942 /builtin-read-tree.c | |
| parent | 132c6e443cb76d0baf9eece7b9424d25dc83a91d (diff) | |
| parent | 1f5a892e5209be329dda316edb0341066d62e3eb (diff) | |
| download | git-97d7fee2cb068f215a593c6e5623b265db45d3bc.tar.gz | |
Merge branch 'maint'
* maint:
Cosmetical command name fix
Start conforming code to "git subcmd" style part 3
t9700/test.pl: remove File::Temp requirement
t9700/test.pl: avoid bareword 'STDERR' in 3-argument open()
Diffstat (limited to 'builtin-read-tree.c')
| -rw-r--r-- | builtin-read-tree.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-read-tree.c b/builtin-read-tree.c index 362216b272..0706c95818 100644 --- a/builtin-read-tree.c +++ b/builtin-read-tree.c @@ -64,7 +64,7 @@ static void prime_cache_tree(void) } -static const char read_tree_usage[] = "git-read-tree (<sha> | [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] [-u | -i]] [--exclude-per-directory=<gitignore>] [--index-output=<file>] <sha1> [<sha2> [<sha3>]])"; +static const char read_tree_usage[] = "git read-tree (<sha> | [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] [-u | -i]] [--exclude-per-directory=<gitignore>] [--index-output=<file>] <sha1> [<sha2> [<sha3>]])"; static struct lock_file lock_file; |