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>

diff --git a/Documentation/git-rerere.txt b/Documentation/git-rerere.txt
index 9d0e6f53e7e009cf4fa693f4dc82078fff6e0a76..992b469270c004f4ce7c4223dbc3b84239a14a5f 100644 (file)
--- 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 12570537d37ac5ef16b6e08034b922278bfccdd6..8b7392d5b4483ff961e14fc7ae5194d97d188d8b 100644 (file)
--- 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,
 };