X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;ds=sidebyside;f=diff.h;h=9f0852d321bbed548fa57b5afdc3aad25c1dd943;hb=a8be83fe00eded0bd6cb0001879ddf211a2cf2f2;hp=3fcf7010e38913a697c927882895984248b9f805;hpb=67574c403f1e27660bbd0348b81b31adc9889b20;p=git.git

diff --git a/diff.h b/diff.h
index 3fcf7010..9f0852d3 100644
--- a/diff.h
+++ b/diff.h
@@ -35,27 +35,23 @@ 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
+
 extern void diff_setup(int flags);
 
 #define DIFF_DETECT_RENAME	1
 #define DIFF_DETECT_COPY	2
 
-extern void diffcore_rename(int rename_copy, int minimum_score);
-
 #define DIFF_PICKAXE_ALL	1
-extern void diffcore_pickaxe(const char *needle, int opts);
-
-extern void diffcore_pathspec(const char **pathspec);
-
-extern void diffcore_order(const char *orderfile);
-
-extern void diffcore_break(int max_score);
 
 extern void diffcore_std(const char **paths,
 			 int detect_rename, int rename_score,
 			 const char *pickaxe, int pickaxe_opts,
 			 int break_opt,
-			 const char *orderfile);
+			 const char *orderfile, const char *filter);
+
+extern void diffcore_std_no_resolve(const char **paths,
+				    const char *pickaxe, int pickaxe_opts,
+				    const char *orderfile, const char *filter);
 
 extern int diff_queue_is_empty(void);
 
@@ -64,6 +60,6 @@ extern int diff_queue_is_empty(void);
 #define DIFF_FORMAT_PATCH	2
 #define DIFF_FORMAT_NO_OUTPUT	3
 
-extern void diff_flush(int output_style, int resolve_rename_copy);
+extern void diff_flush(int output_style);
 
 #endif /* DIFF_H */