From: Ævar Arnfjörð Bjarmason Date: Fri, 30 Sep 2022 18:07:46 GMT Subject: [PATCH v3 23/36] doc txt & -h consistency: make "read-tree" consistent Message-ID: In-Reply-To: The C version was right to use "()" in place of "[]", 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 --- Documentation/git-read-tree.txt | 2 +- builtin/read-tree.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/git-read-tree.txt b/Documentation/git-read-tree.txt index b9bfdc0a319..7567955bad8 100644 --- 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=] +'git read-tree' [(-m [--trivial] [--aggressive] | --reset | --prefix=) [-u | -i]] [--index-output=] [--no-sparse-checkout] (--empty | [ []]) diff --git a/builtin/read-tree.c b/builtin/read-tree.c index b3a389e1b1f..f4cbe460b97 100644 --- 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=)\n" - " [-u | -i]] [--no-sparse-checkout] [--index-output=]\n" + " [-u | -i]] [--index-output=] [--no-sparse-checkout]\n" " (--empty | [ []])"), NULL }; -- 2.38.0.rc2.935.g6b421ae1592