Merge branch 'mm/maint-log-n-with-diff-filtering'
authorJunio C Hamano <gitster@pobox.com>
Sun, 20 Mar 2011 06:25:38 +0000 (23:25 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 20 Mar 2011 06:25:38 +0000 (23:25 -0700)
commita91df69cbb5ced7837525106ff57ff349180770b
tree748170216a91f1a9f3617a49e9f34d21120e0db4
parent06a054014b23494f5ace2699e2aaf7b35757e010
parent251df09be3af658404f5f5f670a013d5806645d4
Merge branch 'mm/maint-log-n-with-diff-filtering'

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