Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
update release notes for git svn in 1.6.6
[gitweb.git]
/
rerere.h
diff --git
a/rerere.h
b/rerere.h
index f9b03862fe78b560ee606637be3b1ce972a2cc14..13313f3f2b2cc6a8d895305b7ac92c12c1753682 100644
(file)
--- a/
rerere.h
+++ b/
rerere.h
@@
-5,5
+5,7
@@
extern int setup_rerere(struct string_list *);
extern int rerere(void);
+extern const char *rerere_path(const char *hex, const char *file);
+extern int has_rerere_resolution(const char *hex);
#endif