From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 10 Sep 2012 22:42:48 +0000 (-0700)
Subject: Merge branch 'jk/maint-quiet-is-synonym-to-s-in-log'
X-Git-Tag: v1.8.0-rc0~85
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1c0712dea8fd927faa49fe494f507d18f0d41264;p=git.git

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
---

1c0712dea8fd927faa49fe494f507d18f0d41264