doc txt & -h consistency: make "rerere" consistent

For "rerere" say "pathspec" consistently, and list the subcommands in
the order that they're discussed in the "COMMANDS" section of the
documentation.

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:14 +02:00 коммит произвёл Junio C Hamano
Родитель 8c9e292dc0
Коммит d7756184c9
2 изменённых файлов: 2 добавлений и 2 удалений

Просмотреть файл

@ -8,7 +8,7 @@ git-rerere - Reuse recorded resolution of conflicted merges
SYNOPSIS
--------
[verse]
'git rerere' [clear | forget <pathspec> | diff | remaining | status | gc]
'git rerere' [clear | forget <pathspec>... | diff | status | remaining | gc]
DESCRIPTION
-----------

Просмотреть файл

@ -10,7 +10,7 @@
#include "pathspec.h"
static const char * const rerere_usage[] = {
N_("git rerere [clear | forget <pathspec>... | status | remaining | diff | gc]"),
N_("git rerere [clear | forget <pathspec>... | diff | status | remaining | gc]"),
NULL,
};