aboutsummaryrefslogtreecommitdiff
path: root/builtin.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-06-28 15:19:11 -0700
committerJunio C Hamano <gitster@pobox.com>2012-06-28 15:19:11 -0700
commitdefd7aa34c81148904ed5d22d975b5b3c843e040 (patch)
tree556f7f92c9cef72ab66f0f68e6ecd473b9a4bfd9 /builtin.h
parentbc9e7dd41fe8b51cc7f2e79312a2ff777899f930 (diff)
parentaf63b543ed9f7d606cdd2c7a3bcded4e2dc8dad4 (diff)
downloadgit-defd7aa34c81148904ed5d22d975b5b3c843e040.tar.gz
git-defd7aa34c81148904ed5d22d975b5b3c843e040.tar.xz
Merge branch 'jk/diff-no-index-pager'
"git diff --no-index" did not work with pagers correctly.
Diffstat (limited to 'builtin.h')
-rw-r--r--builtin.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/builtin.h b/builtin.h
index 712c4e946..b6cbbc9af 100644
--- 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);