Code

Merge branch 'mm/maint-log-n-with-diff-filtering' into maint
authorJunio C Hamano <gitster@pobox.com>
Sun, 3 Apr 2011 19:31:59 +0000 (12:31 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 3 Apr 2011 19:31:59 +0000 (12:31 -0700)
commit1030536153db404daba4a140d1e3fa1a7ba470a5
tree7884237494bd5202639c72dc8080f03baab35cb9
parentc3d1a4368ad4049a96a35f52da99024be4fe53a8
parent251df09be3af658404f5f5f670a013d5806645d4
Merge branch 'mm/maint-log-n-with-diff-filtering' into maint

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