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>
Ævar Arnfjörð Bjarmason committed
Oct 13, 2022 at 17:39 UTC
d7756184c94547348766216614855e4db7a3a888
2 files changed
+2
-2
Documentation/git-rerere.txt
+1
-1
@@ -8,7 +8,7 @@ git-rerere - Reuse recorded resolution of conflicted merges
8
SYNOPSIS
9
--------
10
[verse]
11
-'git rerere' [clear | forget <pathspec> | diff | remaining | status | gc]
11
+'git rerere' [clear | forget <pathspec>... | diff | status | remaining | gc]
12
13
DESCRIPTION
14
-----------
builtin/rerere.c
+1
-1
@@ -10,7 +10,7 @@
10
#include "pathspec.h"
11
12
static const char * const rerere_usage[] = {
13
- N_("git rerere [clear | forget <pathspec>... | status | remaining | diff | gc]"),
13
+ N_("git rerere [clear | forget <pathspec>... | diff | status | remaining | gc]"),
14
NULL,
15
};
16