Merge branch 'jk/maint-quiet-is-synonym-to-s-in-log'
commit1c0712dea8fd927faa49fe494f507d18f0d41264
authorJunio C Hamano <gitster@pobox.com>
Mon, 10 Sep 2012 22:42:48 +0000 (10 15:42 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 10 Sep 2012 22:42:48 +0000 (10 15:42 -0700)
tree364ec91c8754a32dfd3b93232281b44f3d111186
parent7ff38b0847a641970a30cdfdae30f97afc233ea9
parentf9c75d858d85449a8a6f635bef4b5bd003edd764
Merge branch 'jk/maint-quiet-is-synonym-to-s-in-log'

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