diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-06-06 11:40:14 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-06-06 11:40:14 -0700 |
| commit | 456a4c08b8d8ddefda939014c15877ace3e3f499 (patch) | |
| tree | 02e78225fadc62bb3585494b9cb418d833bd8e01 /diff.h | |
| parent | Merge branch 'bc/maint-status-z-to-use-porcelain' (diff) | |
| parent | diff: futureproof "stop feeding the backend early" logic (diff) | |
| download | git-456a4c08b8d8ddefda939014c15877ace3e3f499.tar.gz git-456a4c08b8d8ddefda939014c15877ace3e3f499.zip | |
Merge branch 'jk/diff-not-so-quick'
* jk/diff-not-so-quick:
diff: futureproof "stop feeding the backend early" logic
diff_tree: disable QUICK optimization with diff filter
Conflicts:
diff.c
Diffstat (limited to 'diff.h')
| -rw-r--r-- | diff.h | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -198,6 +198,8 @@ extern void diff_tree_combined_merge(const unsigned char *sha1, int, struct rev_ void diff_set_mnemonic_prefix(struct diff_options *options, const char *a, const char *b); +extern int diff_can_quit_early(struct diff_options *); + extern void diff_addremove(struct diff_options *, int addremove, unsigned mode, |