doc txt & -h consistency: make "read-tree" consistent

The C version was right to use "()" in place of "[]" around the option
listing, let's update the *.txt version accordingly, and furthermore
list the *.c options in the same order as the *.txt.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/git-read-tree.txt b/Documentation/git-read-tree.txt
index b9bfdc0a319a996c2f1ad9e256dab0f8eac8a0fb..7567955bad8552800b92ade66007c442dc000715 100644 (file)
--- a/Documentation/git-read-tree.txt
+++ b/Documentation/git-read-tree.txt
@@ -9,7 +9,7 @@ git-read-tree - Reads tree information into the index
 SYNOPSIS
 --------
 [verse]
-'git read-tree' [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>]
+'git read-tree' [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>)
                [-u | -i]] [--index-output=<file>] [--no-sparse-checkout]
                (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])
 

diff --git a/builtin/read-tree.c b/builtin/read-tree.c
index b3a389e1b1f88e0c4fea52c408310074325b1264..f4cbe460b978447ba10bbb3e71b4faee1015d56d 100644 (file)
--- a/builtin/read-tree.c
+++ b/builtin/read-tree.c
@@ -39,7 +39,7 @@ static int list_tree(struct object_id *oid)
 
 static const char * const read_tree_usage[] = {
        N_("git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>)\n"
-          "              [-u | -i]] [--no-sparse-checkout] [--index-output=<file>]\n"
+          "              [-u | -i]] [--index-output=<file>] [--no-sparse-checkout]\n"
           "              (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"),
        NULL
 };