Merge branch 'mm/maint-log-n-with-diff-filtering' into next
commit33af1cd1591d360cf0c63f4d02259fc971646837
authorJunio C Hamano <gitster@pobox.com>
Fri, 11 Mar 2011 06:46:37 +0000 (10 22:46 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 11 Mar 2011 06:46:37 +0000 (10 22:46 -0800)
tree37d6094226675bdd57938e557c32682539fe9532
parentab70d5775514717cec0c5764f4dcf179c84847c4
parent251df09be3af658404f5f5f670a013d5806645d4
Merge branch 'mm/maint-log-n-with-diff-filtering' into next

* mm/maint-log-n-with-diff-filtering:
  log: fix --max-count when used together with -S or -G
builtin/log.c