Merge branch 'jk/maint-quiet-is-synonym-to-s-in-log' into maint-1.7.11
commit19ece726e194f86b8d316d35b65daa92c245453b
authorJunio C Hamano <gitster@pobox.com>
Sat, 15 Sep 2012 03:48:31 +0000 (14 20:48 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 15 Sep 2012 03:48:31 +0000 (14 20:48 -0700)
tree0c13f180db74f7bd90c5d2df9d4a7c03a74765ce
parentddbca33ca7e08d837ab4faa9a7da563f3f7700aa
parentf9c75d858d85449a8a6f635bef4b5bd003edd764
Merge branch 'jk/maint-quiet-is-synonym-to-s-in-log' into maint-1.7.11

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