[PATCH v5 20/34] doc txt & -h consistency: make "rerere" consistent
- From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
- Date
- Oct 13, 2022, 15:39 UTC
- Message-ID
- <patch-v5-20.34-058b22e22f7-20221013T153626Z-avarab@gmail.com>
- In-Reply-To
- <cover-v5-00.34-00000000000-20221013T153625Z-avarab@gmail.com>
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> --- Documentation/git-rerere.txt | 2 +- builtin/rerere.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/git-rerere.txt b/Documentation/git-rerere.txt index 9d0e6f53e7e..992b469270c 100644 --- a/Documentation/git-rerere.txt +++ b/Documentation/git-rerere.txt @@ -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 ----------- diff --git a/builtin/rerere.c b/builtin/rerere.c index 12570537d37..8b7392d5b44 100644 --- a/builtin/rerere.c +++ b/builtin/rerere.c @@ -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, };
-- 2.38.0.1085.gb7e61c3016c