Merge branch 'jk/diff-no-index-initialize'
commit12e5bdd9c4bfa0131b00b20be2cc48a8e2b08a2d
authorJunio C Hamano <gitster@pobox.com>
Thu, 7 Mar 2019 00:59:59 +0000 (7 09:59 +0900)
committerJunio C Hamano <gitster@pobox.com>
Thu, 7 Mar 2019 00:59:59 +0000 (7 09:59 +0900)
treefba33edaee8716bf482f11de261f6af23568636a
parent68731c7ec780f1ad1c08d9c9c7d297cdc553a118
parent287ab28bfae14431f3f57abeb92149c460044850
Merge branch 'jk/diff-no-index-initialize'

"git diff --no-index" may still want to access Git goodies like
--ext-diff and --textconv, but so far these have been ignored,
which has been corrected.

* jk/diff-no-index-initialize:
  diff: reuse diff setup for --no-index case
builtin/diff.c
diff.h