From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 01 Oct 2022 18:45:43 GMT
Subject: Re: [PATCH v3 22/36] doc txt & -h consistency: make "rerere" consistent
Message-ID: <xmqqmtaf2xig.fsf@gitster.g>
In-Reply-To: <patch-v3-22.36-702eb747c0f-20220930T180415Z-avarab@gmail.com>

Ævar Arnfjörð Bjarmason  <avarab@gmail.com> writes:

> For "rerere" say "pathspec" consistently, and list the subcommands in
> the order that they're discussed in the "COMMANDS" section of the
> documentation.

pathspec refers to the entire set of patterns, which consists of one
or more "pathspec element"s, so there is no need for "..." there.

Listing the commands in the order they are described does make
sense.

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