X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;ds=sidebyside;f=diff.h;h=cae6e14fc519be35210b1772feb8c881d333ceb1;hb=09d74b3b5ac634495e17b92b2b785fa996ffce97;hp=86a645afee15ae061b7965b46ec2e97aa406bcec;hpb=57fe64a40d95dd99d798c6d7c81c1a76d24a8e7c;p=git.git

diff --git a/diff.h b/diff.h
index 86a645af..cae6e14f 100644
--- a/diff.h
+++ b/diff.h
@@ -15,14 +15,35 @@ extern void diff_change(unsigned mode1, unsigned mode2,
 			     const unsigned char *sha2,
 			     const char *base, const char *path);
 
+extern void diff_guif(unsigned mode1,
+		      unsigned mode2,
+		      const unsigned char *sha1,
+		      const unsigned char *sha2,
+		      const char *path1,
+		      const char *path2);
+
 extern void diff_unmerge(const char *path);
 
 extern int diff_scoreopt_parse(const char *opt);
 
-extern void diff_setup(int detect_rename, int minimum_score,
-		       int reverse, int raw_output,
-		       const char **spec, int cnt);
+#define DIFF_FORMAT_HUMAN	0
+#define DIFF_FORMAT_MACHINE	1
+#define DIFF_FORMAT_PATCH	2
+#define DIFF_FORMAT_NO_OUTPUT	3
+extern void diff_setup(int reverse);
+
+#define DIFF_DETECT_RENAME	1
+#define DIFF_DETECT_COPY	2
+
+extern void diffcore_rename(int rename_copy, int minimum_score);
+
+extern void diffcore_prune(void);
+
+extern void diffcore_pickaxe(const char *needle);
+extern void diffcore_pathspec(const char **pathspec);
+
+extern int diff_queue_is_empty(void);
 
-extern void diff_flush(void);
+extern void diff_flush(int output_style);
 
 #endif /* DIFF_H */