]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'jk/maint-quiet-is-synonym-to-s-in-log'
authorJunio C Hamano <gitster@pobox.com>
Mon, 10 Sep 2012 22:42:48 +0000 (15:42 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 10 Sep 2012 22:42:48 +0000 (15:42 -0700)
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

1  2 
builtin/log.c

diff --cc builtin/log.c
Simple merge