Merge branch 'sb/notes-parse-opt'

* sb/notes-parse-opt:
  notes: rework subcommands and parse options

Conflicts:
	builtin/notes.c

diff --cc builtin/notes.c
Simple merge

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