projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
diff-tree: don't print multiple headers for merges when silent.
[git.git]
/
diff.h
diff --git
a/diff.h
b/diff.h
index
cce4649
..
7473c52
100644
(file)
--- a/
diff.h
+++ b/
diff.h
@@
-17,8
+17,11
@@
extern void diff_change(unsigned mode1, unsigned mode2,
extern void diff_unmerge(const char *path);
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,
extern void diff_setup(int detect_rename, int minimum_score,
- int reverse,
+ const char *pickaxe,
+ int reverse, int raw_output,
const char **spec, int cnt);
extern void diff_flush(void);
const char **spec, int cnt);
extern void diff_flush(void);