projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'js/repoconfig'
[git.git]
/
diff.h
diff --git
a/diff.h
b/diff.h
index
52fff66
..
7150b90
100644
(file)
--- a/
diff.h
+++ b/
diff.h
@@
-28,10
+28,11
@@
struct diff_options {
with_raw:1,
with_stat:1,
tree_in_recursive:1,
with_raw:1,
with_stat:1,
tree_in_recursive:1,
- full_index:1;
+ full_index:1,
+ silent_on_remove:1,
+ find_copies_harder:1;
int break_opt;
int detect_rename;
int break_opt;
int detect_rename;
- int find_copies_harder;
int line_termination;
int output_format;
int pickaxe_opts;
int line_termination;
int output_format;
int pickaxe_opts;
@@
-168,4
+169,8
@@
extern void diff_flush(struct diff_options*);
extern const char *diff_unique_abbrev(const unsigned char *, int);
extern const char *diff_unique_abbrev(const unsigned char *, int);
+extern int run_diff_files(struct rev_info *revs, int silent_on_removed);
+
+extern int run_diff_index(struct rev_info *revs, int cached);
+
#endif /* DIFF_H */
#endif /* DIFF_H */