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

Doc update.

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

diff --cc Documentation/git-notes.txt
Simple merge

diff --cc builtin/notes.c
Simple merge