From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 11 Jul 2012 19:46:21 +0000 (-0700)
Subject: Merge branch 'jk/diff-no-index-pager' into maint
X-Git-Tag: v1.7.11.2~7
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/95c9eb8fcd4c9a72954c9d16b0d4c653a1f02085?ds=inline;hp=-c

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
---

95c9eb8fcd4c9a72954c9d16b0d4c653a1f02085
diff --combined builtin.h
index 338f540e39,999ba3be7c..e426de3ff7
--- a/builtin.h
+++ b/builtin.h
@@@ -41,6 -41,8 +41,8 @@@ int copy_note_for_rewrite(struct notes_
  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);
  
@@@ -61,7 -63,6 +63,7 @@@ extern int cmd_cherry(int argc, const c
  extern int cmd_cherry_pick(int argc, const char **argv, const char *prefix);
  extern int cmd_clone(int argc, const char **argv, const char *prefix);
  extern int cmd_clean(int argc, const char **argv, const char *prefix);
 +extern int cmd_column(int argc, const char **argv, const char *prefix);
  extern int cmd_commit(int argc, const char **argv, const char *prefix);
  extern int cmd_commit_tree(int argc, const char **argv, const char *prefix);
  extern int cmd_config(int argc, const char **argv, const char *prefix);