Merge branch 'jc/log-quiet-fix'
commitb9575e78e504d0fed4747bb2325aa09e2626b6e9
authorJunio C Hamano <gitster@pobox.com>
Tue, 31 May 2011 19:09:18 +0000 (31 12:09 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 31 May 2011 19:09:18 +0000 (31 12:09 -0700)
tree1be92a68715d73560c3139b322bdcc019f3a49fc
parent2177dc69cd693eeb52def931f41ad4f3a766846e
parent01771a8e2b9f697d1ae4e3d20d9ab86a4aa9e633
Merge branch 'jc/log-quiet-fix'

* jc/log-quiet-fix:
  log: --quiet should serve as synonym to -s
builtin/log.c