Merge branch 'jc/maint-limit-note-output' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 5 Feb 2010 18:59:05 +0000 (10:59 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 5 Feb 2010 18:59:05 +0000 (10:59 -0800)
* jc/maint-limit-note-output:
  Fix "log --oneline" not to show notes
  Fix "log" family not to be too agressive about showing notes


Trivial merge