X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=diff.h;h=7473c522846068b8e4ea3a4f4a62eba239b0e90e;hb=d6db01075b65da2b8584a0450619390893aae103;hp=56ca373248ebb30ac5f832488aa3255a97a50618;hpb=86436c28289eedd2ee9b7f9c872a0ed039866a0f;p=git.git

diff --git a/diff.h b/diff.h
index 56ca3732..7473c522 100644
--- a/diff.h
+++ b/diff.h
@@ -1,17 +1,29 @@
+/*
+ * Copyright (C) 2005 Junio C Hamano
+ */
 #ifndef DIFF_H
 #define DIFF_H
 
-extern void prepare_diff_cmd(void);
+extern void diff_addremove(int addremove,
+			   unsigned mode,
+			   const unsigned char *sha1,
+			   const char *base,
+			   const char *path);
 
-extern void show_differences(const char *name, /* filename on the filesystem */
-			     const char *label, /* diff label to use */
-			     void *old_contents, /* contents in core */
-			     unsigned long long old_size, /* size in core */
-			     int reverse /* 0: diff core file
-					    1: diff file core */);
+extern void diff_change(unsigned mode1, unsigned mode2,
+			     const unsigned char *sha1,
+			     const unsigned char *sha2,
+			     const char *base, const char *path);
 
-extern void show_diff_empty(const unsigned char *sha1,
-			    const char *name,
-			    int reverse);
+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,
+		       const char *pickaxe,
+		       int reverse, int raw_output,
+		       const char **spec, int cnt);
+
+extern void diff_flush(void);
 
 #endif /* DIFF_H */