Fourth batch for 1.7.12

diff --git a/builtin.h b/builtin.h
index 712c4e946c223b48eb5ee854d909df089ccfee42..b6cbbc9afdac7894c0d3b255fab359d208db9bc0 100644 (file)
--- a/builtin.h
+++ b/builtin.h
@@ -40,6 +40,8 @@ int copy_note_for_rewrite(struct notes_rewrite_cfg *c,
 void finish_copy_notes_for_rewrite(struct notes_rewrite_cfg *c);
 
 extern int check_pager_config(const char *cmd);
+struct diff_options;
+extern void setup_diff_pager(struct diff_options *);
 
 extern int textconv_object(const char *path, unsigned mode, const unsigned char *sha1, char **buf, unsigned long *buf_size);