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 43677297f3b85814c18c972a159b81c8076bc445..e8dec1b3c89a66dc2f9e78737fa7d243bee85d37 100644 (file)
--- 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 a2a542f82b2a3cc9ff8d4615192a406c0012d22a..1a2c7d92ad7e73246be8dc64946feb00c16f7261 100644 (file)
--- 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
 };