From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 6 Dec 2017 17:23:40 +0000 (-0800)
Subject: Merge branch 'rd/doc-notes-prune-fix'
X-Git-Tag: v2.16.0-rc0~74
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/5b5710effa68e3901a44bb2e55485a4d8a89308f?hp=24065b827bcb96b0ca1eca8c9061f0efdde105f1

Merge branch 'rd/doc-notes-prune-fix'

Doc update.

* rd/doc-notes-prune-fix:
notes: correct 'git notes prune' options to '[-n] [-v]'
---

diff --git a/Documentation/git-notes.txt b/Documentation/git-notes.txt
index 43677297f3..e8dec1b3c8 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 a2a542f82b..1a2c7d92ad 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
 };