summaryrefslogtreecommitdiff
path: root/builtin/read-tree.c
diff options
context:
space:
mode:
authorAlex Henrie <alexhenrie24@gmail.com>2015-08-27 04:27:06 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-08-28 19:01:37 (GMT)
commit9476c2c39e1af1ebe00d061a852b9d56553d8d1f (patch)
treee600c7564e327556cef110162f7a5bdbe1fc5493 /builtin/read-tree.c
parent230c6cdb00cddd5f4f1084e6855214da93642219 (diff)
downloadgit-9476c2c39e1af1ebe00d061a852b9d56553d8d1f.zip
git-9476c2c39e1af1ebe00d061a852b9d56553d8d1f.tar.gz
git-9476c2c39e1af1ebe00d061a852b9d56553d8d1f.tar.bz2
read-tree: replace bracket set with parentheses to clarify usage
-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>
Diffstat (limited to 'builtin/read-tree.c')
-rw-r--r--builtin/read-tree.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/read-tree.c b/builtin/read-tree.c
index 042ac1b..70dc100 100644
--- a/builtin/read-tree.c
+++ b/builtin/read-tree.c
@@ -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
};