mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-05 19:56:12 +02:00
Code

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 committed by Junio C Hamano
parent 8c9e292dc0
commit d7756184c9
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/git-rerere.txt
View File

@ -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
-----------

2
builtin/rerere.c
View File

@ -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,
};