From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 9 Sep 2013 21:28:35 +0000 (-0700)
Subject: Merge branch 'jc/diff-filter-negation'
X-Git-Tag: v1.8.5-rc0~173
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/01a2a03c56e8d4cd9724b185a48a2a1ea9852f0c?hp=01a2a03c56e8d4cd9724b185a48a2a1ea9852f0c

Merge branch 'jc/diff-filter-negation'

Teach "git diff --diff-filter" to express "I do not want to see
these classes of changes" more directly by listing only the
unwanted ones in lowercase (e.g. "--diff-filter=d" will show
everything but deletion) and deprecate "diff-files -q" which did
the same thing as "--diff-filter=d".

* jc/diff-filter-negation:
diff: deprecate -q option to diff-files
diff: allow lowercase letter to specify what change class to exclude
diff: reject unknown change class given to --diff-filter
diff: preparse --diff-filter string argument
diff: factor out match_filter()
diff: pass the whole diff_options to diffcore_apply_filter()
---