Git fork

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

Doc update.

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

+2 -2
+1 -1
Documentation/git-notes.txt
··· 18 18 'git notes' merge --commit [-v | -q] 19 19 'git notes' merge --abort [-v | -q] 20 20 'git notes' remove [--ignore-missing] [--stdin] [<object>...] 21 - 'git notes' prune [-n | -v] 21 + 'git notes' prune [-n] [-v] 22 22 'git notes' get-ref 23 23 24 24
+1 -1
builtin/notes.c
··· 33 33 N_("git notes merge --commit [-v | -q]"), 34 34 N_("git notes merge --abort [-v | -q]"), 35 35 N_("git notes [--ref <notes-ref>] remove [<object>...]"), 36 - N_("git notes [--ref <notes-ref>] prune [-n | -v]"), 36 + N_("git notes [--ref <notes-ref>] prune [-n] [-v]"), 37 37 N_("git notes [--ref <notes-ref>] get-ref"), 38 38 NULL 39 39 };