Merge branch 'jc/maint-limit-note-output'

* jc/maint-limit-note-output:
  Fix "log --oneline" not to show notes
  Fix "log" family not to be too agressive about showing notes

diff --cc builtin-log.c
Simple merge

diff --cc commit.h
Simple merge

diff --cc pretty.c
Simple merge

diff --cc revision.c
Simple merge