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)
commitb401a12a2c49d3f3e81e356782d9ca49aaa97faa
tree3c08d47265838d7b13ae8e2649835159077a6f0c
parent3325cea0f7ef7355f6806b2fc88acdb2e27785ac
parent7dccadf363f9d9ff564ad34117266b2d557a2bc8
Merge branch 'jc/maint-limit-note-output' into maint

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