projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] Fix several gcc4 signedness warnings
[git.git]
/
diff.h
diff --git
a/diff.h
b/diff.h
index
c64880c
..
9f0852d
100644
(file)
--- a/
diff.h
+++ b/
diff.h
@@
-47,7
+47,11
@@
extern void diffcore_std(const char **paths,
int detect_rename, int rename_score,
const char *pickaxe, int pickaxe_opts,
int break_opt,
int detect_rename, int rename_score,
const char *pickaxe, int pickaxe_opts,
int break_opt,
- const char *orderfile);
+ const char *orderfile, const char *filter);
+
+extern void diffcore_std_no_resolve(const char **paths,
+ const char *pickaxe, int pickaxe_opts,
+ const char *orderfile, const char *filter);
extern int diff_queue_is_empty(void);
extern int diff_queue_is_empty(void);
@@
-56,6
+60,6
@@
extern int diff_queue_is_empty(void);
#define DIFF_FORMAT_PATCH 2
#define DIFF_FORMAT_NO_OUTPUT 3
#define DIFF_FORMAT_PATCH 2
#define DIFF_FORMAT_NO_OUTPUT 3
-extern void diff_flush(int output_style
, int resolve_rename_copy
);
+extern void diff_flush(int output_style);
#endif /* DIFF_H */
#endif /* DIFF_H */