summaryrefslogtreecommitdiff
path: root/builtin.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-07-11 12:46:21 -0700
committerJunio C Hamano <gitster@pobox.com>2012-07-11 12:46:21 -0700
commit95c9eb8fcd4c9a72954c9d16b0d4c653a1f02085 (patch)
tree312bc55583092c4db0ce3e2634b58b1029a36f35 /builtin.h
parent9ca724933a8d50633699acf3e5731fa392e2ff36 (diff)
parentaf63b543ed9f7d606cdd2c7a3bcded4e2dc8dad4 (diff)
downloadgit-95c9eb8fcd4c9a72954c9d16b0d4c653a1f02085.tar.gz
Merge branch 'jk/diff-no-index-pager' into maint
"git diff --no-index" did not work with pagers correctly. * jk/diff-no-index-pager: do not run pager with diff --no-index --quiet fix pager.diff with diff --no-index
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 338f540e39..e426de3ff7 100644
--- a/builtin.h
+++ b/builtin.h
@@ -41,6 +41,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);