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.
This commit is contained in:
@ -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)
|
||||
|
||||
Reference in New Issue
Block a user