summaryrefslogtreecommitdiff
path: root/diff.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-06-06 11:40:14 -0700
committerJunio C Hamano <gitster@pobox.com>2011-06-06 11:40:14 -0700
commit456a4c08b8d8ddefda939014c15877ace3e3f499 (patch)
tree02e78225fadc62bb3585494b9cb418d833bd8e01 /diff.h
parent6c92972d7f5ab247a8cab5e4b88cb281bf201970 (diff)
parent28b9264dd6cbadcef8b3e48c24ffcb2893b668b3 (diff)
downloadgit-456a4c08b8d8ddefda939014c15877ace3e3f499.tar.gz
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.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/diff.h b/diff.h
index adb40ba273..6d303c1d50 100644
--- a/diff.h
+++ b/diff.h
@@ -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,