Merge branch 'jc/hold-diff-remove-q-synonym-for-no-deletion'
commit2687ffdeb76816a1645a5c3e3c7aaf654cc923bc
authorJunio C Hamano <gitster@pobox.com>
Fri, 7 Mar 2014 23:17:40 +0000 (7 15:17 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 7 Mar 2014 23:17:41 +0000 (7 15:17 -0800)
treefea99a64d7d8bc7ff3211155da3f23853b09d68b
parent289ca27deefab9b145a156a30571d9d25a9ad17c
parentc48f6816f03bfb2a09067a4fcfb4698a2192f6f9
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.
diff-lib.c
diff-no-index.c
diff.c
diff.h