Split up git-pull-script into separate "fetch" and "merge" phases.
[git/fastimport.git] / diff.h
blobcae6e14fc519be35210b1772feb8c881d333ceb1
1 /*
2 * Copyright (C) 2005 Junio C Hamano
3 */
4 #ifndef DIFF_H
5 #define DIFF_H
7 extern void diff_addremove(int addremove,
8 unsigned mode,
9 const unsigned char *sha1,
10 const char *base,
11 const char *path);
13 extern void diff_change(unsigned mode1, unsigned mode2,
14 const unsigned char *sha1,
15 const unsigned char *sha2,
16 const char *base, const char *path);
18 extern void diff_guif(unsigned mode1,
19 unsigned mode2,
20 const unsigned char *sha1,
21 const unsigned char *sha2,
22 const char *path1,
23 const char *path2);
25 extern void diff_unmerge(const char *path);
27 extern int diff_scoreopt_parse(const char *opt);
29 #define DIFF_FORMAT_HUMAN 0
30 #define DIFF_FORMAT_MACHINE 1
31 #define DIFF_FORMAT_PATCH 2
32 #define DIFF_FORMAT_NO_OUTPUT 3
33 extern void diff_setup(int reverse);
35 #define DIFF_DETECT_RENAME 1
36 #define DIFF_DETECT_COPY 2
38 extern void diffcore_rename(int rename_copy, int minimum_score);
40 extern void diffcore_prune(void);
42 extern void diffcore_pickaxe(const char *needle);
43 extern void diffcore_pathspec(const char **pathspec);
45 extern int diff_queue_is_empty(void);
47 extern void diff_flush(int output_style);
49 #endif /* DIFF_H */