From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 1 Sep 2015 23:31:15 +0000 (-0700)
Subject: Merge branch 'ah/read-tree-usage-string'
X-Git-Tag: v2.6.0-rc0~12
X-Git-Url: https://www.git.lorimer.id.au/gitweb.git/diff_plain/0b20a4680bf668ba2719fa48a9bdbf137253a4b6?hp=8746e30541dbb3e5f68f55519a3f961b0fe09e97

Merge branch 'ah/read-tree-usage-string'

Usage string fix.

* ah/read-tree-usage-string:
read-tree: replace bracket set with parentheses to clarify usage
---

diff --git a/builtin/read-tree.c b/builtin/read-tree.c
index 43b47f72f1..2379e11069 100644
--- a/builtin/read-tree.c
+++ b/builtin/read-tree.c
@@ -34,7 +34,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
 };