diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-09-09 14:28:35 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-09-09 14:28:35 -0700 |
| commit | 01a2a03c56e8d4cd9724b185a48a2a1ea9852f0c (patch) | |
| tree | 85753a9502a729d3be359996a9e98b8532515e8e /t/t3032-merge-recursive-options.sh | |
| parent | Merge branch 'ms/fetch-prune-configuration' (diff) | |
| parent | diff: deprecate -q option to diff-files (diff) | |
| download | tgif-01a2a03c56e8d4cd9724b185a48a2a1ea9852f0c.tar.xz | |
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()
Diffstat (limited to 't/t3032-merge-recursive-options.sh')
0 files changed, 0 insertions, 0 deletions