Code

Merge branch 'jc/maint-limit-note-output'
authorJunio C Hamano <gitster@pobox.com>
Sat, 23 Jan 2010 00:08:01 +0000 (16:08 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sat, 23 Jan 2010 00:08:01 +0000 (16:08 -0800)
* jc/maint-limit-note-output:
  Fix "log --oneline" not to show notes
  Fix "log" family not to be too agressive about showing notes

1  2 
builtin-log.c
commit.h
pretty.c
revision.c

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