X-Git-Url: https://git.octo.it/?a=blobdiff_plain;ds=sidebyside;f=diff.h;h=9f0852d321bbed548fa57b5afdc3aad25c1dd943;hb=d565b3412a0242e2c729bd77d18c74ecd57184dc;hp=c64880cdb1022526371ddcd98bcb9d2221c4ca0c;hpb=ce24067549a8554b214e723d7aa4bc063c54409e;p=git.git

diff --git a/diff.h b/diff.h
index c64880cd..9f0852d3 100644
--- a/diff.h
+++ b/diff.h
@@ -47,7 +47,11 @@ 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);
 
@@ -56,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 */