]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c3d1a43 251df09)
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)
* mm/maint-log-n-with-diff-filtering:
  log: fix --max-count when used together with -S or -G

1  2 
builtin/log.c patch | diff1 | diff2 | blob | history

diff --cc builtin/log.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.