Merge branch 'jk/notes-ui-updates'

* jk/notes-ui-updates:
contrib/completion: --notes, --no-notes
log/pretty-options: Document --[no-]notes and deprecate old notes options
revision.c: make --no-notes reset --notes list
revision.c: support --notes command-line option
notes: refactor display notes default handling
notes: refactor display notes extra refs field
revision.c: refactor notes ref expansion
notes: make expand_notes_ref globally accessible

diff --cc builtin/notes.c
Simple merge

diff --cc contrib/completion/git-completion.bash
Simple merge

diff --cc t/t3301-notes.sh
Simple merge