diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-07-11 21:46:21 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-07-11 21:46:21 +0200 |
| commit | 95c9eb8fcd4c9a72954c9d16b0d4c653a1f02085 (patch) | |
| tree | 312bc55583092c4db0ce3e2634b58b1029a36f35 /builtin.h | |
| parent | Merge branch 'mm/verify-filename-fix' into maint (diff) | |
| parent | do not run pager with diff --no-index --quiet (diff) | |
| download | git-95c9eb8fcd4c9a72954c9d16b0d4c653a1f02085.tar.xz git-95c9eb8fcd4c9a72954c9d16b0d4c653a1f02085.zip | |
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.h | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -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); |