]> git.ipfire.org Git - thirdparty/git.git/commitdiff
read-tree: replace bracket set with parentheses to clarify usage
authorAlex Henrie <alexhenrie24@gmail.com>
Thu, 27 Aug 2015 04:27:06 +0000 (22:27 -0600)
committerJunio C Hamano <gitster@pobox.com>
Fri, 28 Aug 2015 19:01:37 +0000 (12:01 -0700)
-u and -i can only be given if -m, --reset, or --prefix is given.
Without parentheses, it looks like -u and -i can be used no matter
what, and the second pair of brackets is confusing.

Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/read-tree.c

index 042ac1b84f22257d1a8a4d32d34124b6dc372f16..70dc100b43fce41e0a820aba75f0e217cb8ea7c7 100644 (file)
@@ -33,7 +33,7 @@ static int list_tree(unsigned char *sha1)
 }
 
 static const char * const read_tree_usage[] = {
-       N_("git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] [-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"),
+       N_("git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) [-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"),
        NULL
 };