Merge branch 'sb/trailers-docfix'

diff --git a/diff.h b/diff.h
index 5e6bcf092607562a4f29b6e21f449921f744f286..a14895bb824f2c844f8d2382b42d6c6f738e3835 100644 (file)
--- a/diff.h
+++ b/diff.h
@@ -329,6 +329,7 @@ extern int git_diff_ui_config(const char *var, const char *value, void *cb);
 extern void diff_setup(struct diff_options *);
 extern int diff_opt_parse(struct diff_options *, const char **, int, const char *);
 extern void diff_setup_done(struct diff_options *);
+extern int git_config_rename(const char *var, const char *value);
 
 #define DIFF_DETECT_RENAME     1
 #define DIFF_DETECT_COPY       2