Merge branch 'jk/diff-no-index-pager'

"git diff --no-index" did not work with pagers correctly.
2012-06-28 15:19:11 -07:00
parent bc9e7dd41f af63b543ed
commit defd7aa34c
3 changed files with 22 additions and 15 deletions
--- 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);