mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Ævar Arnfjörð Bjarmason
2022-10-13 17:39:15 +02:00
committed by Junio C Hamano
parent d7756184c9
commit e8eeda1f9e
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/git-read-tree.txt
View File

@ -9,7 +9,7 @@ git-read-tree - Reads tree information into the index
SYNOPSIS SYNOPSIS
-------- --------
[verse] [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] [-u | -i]] [--index-output=<file>] [--no-sparse-checkout]
(--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]]) (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])

2
builtin/read-tree.c
View File

@ -39,7 +39,7 @@ static int list_tree(struct object_id *oid)
static const char * const read_tree_usage[] = { static const char * const read_tree_usage[] = {
N_("git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>)\n" 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>]])"), " (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"),
NULL NULL
}; };