diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-03-07 15:17:40 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-03-07 15:17:41 -0800 |
| commit | 2687ffdeb76816a1645a5c3e3c7aaf654cc923bc (patch) | |
| tree | fea99a64d7d8bc7ff3211155da3f23853b09d68b /diff-lib.c | |
| parent | 289ca27deefab9b145a156a30571d9d25a9ad17c (diff) | |
| parent | c48f6816f03bfb2a09067a4fcfb4698a2192f6f9 (diff) | |
| download | git-2687ffdeb76816a1645a5c3e3c7aaf654cc923bc.tar.gz git-2687ffdeb76816a1645a5c3e3c7aaf654cc923bc.tar.xz | |
Merge branch 'jc/hold-diff-remove-q-synonym-for-no-deletion'
Remove a confusing and deprecated "-q" option from "git diff-files";
"git diff-files --diff-filter=d" can be used instead.
Diffstat (limited to 'diff-lib.c')
| -rw-r--r-- | diff-lib.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/diff-lib.c b/diff-lib.c index ec5f722ef..044872935 100644 --- a/diff-lib.c +++ b/diff-lib.c @@ -91,9 +91,6 @@ int run_diff_files(struct rev_info *revs, unsigned int option) unsigned ce_option = ((option & DIFF_RACY_IS_MODIFIED) ? CE_MATCH_RACY_IS_DIRTY : 0); - if (option & DIFF_SILENT_ON_REMOVED) - handle_deprecated_show_diff_q(&revs->diffopt); - diff_set_mnemonic_prefix(&revs->diffopt, "i/", "w/"); if (diff_unmerged_stage < 0) |