Merge branch 'jc/diff-filter-negation'
commit01a2a03c56e8d4cd9724b185a48a2a1ea9852f0c
authorJunio C Hamano <gitster@pobox.com>
Mon, 9 Sep 2013 21:28:35 +0000 (9 14:28 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 9 Sep 2013 21:28:35 +0000 (9 14:28 -0700)
tree85753a9502a729d3be359996a9e98b8532515e8e
parenta5e10f8bc1db418fc806abb7574bb1e468948d19
parent95a7c546b02a962b9e458f7fd2d0ed9b657c0ca6
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()
diff-lib.c
diff-no-index.c
diff.c