summaryrefslogtreecommitdiff
path: root/diff.h
diff options
context:
space:
mode:
Diffstat (limited to 'diff.h')
-rw-r--r--diff.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/diff.h b/diff.h
index 63738c1dd4..4546aad219 100644
--- a/diff.h
+++ b/diff.h
@@ -55,15 +55,18 @@ struct diff_options {
full_index:1,
silent_on_remove:1,
find_copies_harder:1,
+ follow_renames:1,
color_diff:1,
color_diff_words:1,
has_changes:1,
quiet:1,
+ no_index:1,
allow_external:1,
exit_with_status:1;
int context;
int break_opt;
int detect_rename;
+ int skip_stat_unmatch;
int line_termination;
int output_format;
int pickaxe_opts;
@@ -155,8 +158,6 @@ extern void diff_unmerge(struct diff_options *,
unsigned mode,
const unsigned char *sha1);
-extern int diff_scoreopt_parse(const char *opt);
-
#define DIFF_SETUP_REVERSE 1
#define DIFF_SETUP_USE_CACHE 2
#define DIFF_SETUP_USE_SIZE_CACHE 4