Merge branch 'jk/maint-quiet-is-synonym-to-s-in-log' into next
commit06f6953a25b1b3ebac13b57a0ec12fdc791d7962
authorJunio C Hamano <gitster@pobox.com>
Fri, 31 Aug 2012 20:23:46 +0000 (31 13:23 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 31 Aug 2012 20:23:47 +0000 (31 13:23 -0700)
treecaf521ec77ef80a2e4a2c9d5d5df18e4c4273e8d
parent9b7ff7f6c17d9531b4ebeb199a70a759872c7d4f
parentf9c75d858d85449a8a6f635bef4b5bd003edd764
Merge branch 'jk/maint-quiet-is-synonym-to-s-in-log' into next

We tried to bend backwards to allow "--quiet" to be a synonym as
"-s" when given as e.g. "git show --quiet", but did not quite
succeed.

* jk/maint-quiet-is-synonym-to-s-in-log:
  log: fix --quiet synonym for -s
builtin/log.c