From d7756184c94547348766216614855e4db7a3a888 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= Date: Thu, 13 Oct 2022 17:39:14 +0200 Subject: [PATCH] doc txt & -h consistency: make "rerere" consistent MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Junio C Hamano --- 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 9d0e6f53e7..992b469270 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 | diff | remaining | status | gc] +'git rerere' [clear | forget ... | diff | status | remaining | gc] DESCRIPTION ----------- diff --git a/builtin/rerere.c b/builtin/rerere.c index 12570537d3..8b7392d5b4 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 ... | status | remaining | diff | gc]"), + N_("git rerere [clear | forget ... | diff | status | remaining | gc]"), NULL, }; -- 2.52.0