threads / patch / 47277

patchnotes: correct 'git notes prune' options to '[-n] [-v]'

Subject: [PATCH] notes: correct 'git notes prune' options to '[-n] [-v]'

## tl;dr

2 messages between Nov 21, 2017 and Nov 21, 2017. Diffs are folded; open one to read it.

replies: 1people: 2as markdown or json

Robert P. J. Day· Nov 21, 2017, 19:17 UTC · lore

Currently, 'git notes prune' in man page and usage message incorrectly lists options as '[-n | -v]', rather than '[-n] [-v]'.

Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>

---

  i think i got it right this time.

Show changes to 2 files +2 −2

Documentation/git-notes.txt, builtin/notes.c

diff --git a/Documentation/git-notes.txt b/Documentation/git-notes.txt
index 43677297f..e8dec1b3c 100644
--- a/Documentation/git-notes.txt
+++ b/Documentation/git-notes.txt
@@ -18,7 +18,7 @@ SYNOPSIS
 'git notes' merge --commit [-v | -q]
 'git notes' merge --abort [-v | -q]
 'git notes' remove [--ignore-missing] [--stdin] [<object>...]
-'git notes' prune [-n | -v]
+'git notes' prune [-n] [-v]
 'git notes' get-ref


diff --git a/builtin/notes.c b/builtin/notes.c
index d7754db14..892e37a03 100644
--- a/builtin/notes.c
+++ b/builtin/notes.c
@@ -33,7 +33,7 @@ static const char * const git_notes_usage[] = {
 	N_("git notes merge --commit [-v | -q]"),
 	N_("git notes merge --abort [-v | -q]"),
 	N_("git notes [--ref <notes-ref>] remove [<object>...]"),
-	N_("git notes [--ref <notes-ref>] prune [-n | -v]"),
+	N_("git notes [--ref <notes-ref>] prune [-n] [-v]"),
 	N_("git notes [--ref <notes-ref>] get-ref"),
 	NULL
 };

-- 
========================================================================
Robert P. J. Day                                 Ottawa, Ontario, CANADA
                        http://crashcourse.ca

Twitter:                                       http://twitter.com/rpjday
LinkedIn:                               http://ca.linkedin.com/in/rpjday
========================================================================

Jonathan Nieder· Nov 21, 2017, 19:25 UTC · re: Robert P. J. Day · lore

Re: [PATCH] notes: correct 'git notes prune' options to '[-n] [-v]'

Robert P. J. Day wrote:

Show 5 quoted lines

> Currently, 'git notes prune' in man page and usage message
> incorrectly lists options as '[-n | -v]', rather than '[-n] [-v]'.
>
> Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
> ---

Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Thanks.

Show 27 quoted lines

> diff --git a/Documentation/git-notes.txt b/Documentation/git-notes.txt
> index 43677297f..e8dec1b3c 100644
> --- a/Documentation/git-notes.txt
> +++ b/Documentation/git-notes.txt
> @@ -18,7 +18,7 @@ SYNOPSIS
>  'git notes' merge --commit [-v | -q]
>  'git notes' merge --abort [-v | -q]
>  'git notes' remove [--ignore-missing] [--stdin] [<object>...]
> -'git notes' prune [-n | -v]
> +'git notes' prune [-n] [-v]
>  'git notes' get-ref
> 
> 
> diff --git a/builtin/notes.c b/builtin/notes.c
> index d7754db14..892e37a03 100644
> --- a/builtin/notes.c
> +++ b/builtin/notes.c
> @@ -33,7 +33,7 @@ static const char * const git_notes_usage[] = {
>  	N_("git notes merge --commit [-v | -q]"),
>  	N_("git notes merge --abort [-v | -q]"),
>  	N_("git notes [--ref <notes-ref>] remove [<object>...]"),
> -	N_("git notes [--ref <notes-ref>] prune [-n | -v]"),
> +	N_("git notes [--ref <notes-ref>] prune [-n] [-v]"),
>  	N_("git notes [--ref <notes-ref>] get-ref"),
>  	NULL
>  };
>