Merge branch 'wc/rebase-insn'

[git.git] / diff.h

diff --git a/diff.h b/diff.h
index 6ff2b0e3189550afeb1a27c0adec0bfee90261f4..a52496a1086ccbe8ea90acd6800dd355b1d7ff68 100644 (file)
--- a/diff.h
+++ b/diff.h
@@ -232,7 +232,11 @@ extern void diff_flush(struct diff_options*);
 
 extern const char *diff_unique_abbrev(const unsigned char *, int);
 
-extern int run_diff_files(struct rev_info *revs, int silent_on_removed);
+/* do not report anything on removed paths */
+#define DIFF_SILENT_ON_REMOVED 01
+/* report racily-clean paths as modified */
+#define DIFF_RACY_IS_MODIFIED 02
+extern int run_diff_files(struct rev_info *revs, unsigned int option);
 extern int setup_diff_no_index(struct rev_info *revs,
                int argc, const char ** argv, int nongit, const char *prefix);
 extern int run_diff_files_cmd(struct rev_info *revs, int argc, const char **argv);