diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-03-07 00:59:59 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-03-07 00:59:59 (GMT) |
| commit | 12e5bdd9c4bfa0131b00b20be2cc48a8e2b08a2d (patch) | |
| tree | fba33edaee8716bf482f11de261f6af23568636a /diff.h | |
| parent | 68731c7ec780f1ad1c08d9c9c7d297cdc553a118 (diff) | |
| parent | 287ab28bfae14431f3f57abeb92149c460044850 (diff) | |
| download | git-12e5bdd9c4bfa0131b00b20be2cc48a8e2b08a2d.zip git-12e5bdd9c4bfa0131b00b20be2cc48a8e2b08a2d.tar.gz git-12e5bdd9c4bfa0131b00b20be2cc48a8e2b08a2d.tar.bz2 | |
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
Diffstat (limited to 'diff.h')
| -rw-r--r-- | diff.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -438,7 +438,7 @@ int diff_flush_patch_id(struct diff_options *, struct object_id *, int); int diff_result_code(struct diff_options *, int); -void diff_no_index(struct repository *, struct rev_info *, int, const char **); +void diff_no_index(struct rev_info *, int, const char **); int index_differs_from(struct repository *r, const char *def, const struct diff_flags *flags, |