Merge branch 'jc/maint-diff-quiet'
authorJunio C Hamano <gitster@pobox.com>
Tue, 16 Sep 2008 07:48:16 +0000 (00:48 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 16 Sep 2008 07:48:16 +0000 (00:48 -0700)
* jc/maint-diff-quiet:
  diff --quiet: make it synonym to --exit-code >/dev/null
  diff Porcelain: do not disable auto index refreshing on -C -C

1  2 
diff.c

diff --cc diff.c
Simple merge