Merge branch 'ml/pager' into next

* ml/pager:
  pager: environment variable GIT_PAGER to override PAGER
  pager: config variable pager.color
  Builtins: control the use of pager from the command table.
  Fix up some fallout from "setup_git_directory()" cleanups
  Fix double "close()" in ce_compare_data
This commit is contained in:
Junio C Hamano
2006-07-31 15:52:08 -07:00
11 changed files with 34 additions and 17 deletions

View File

@@ -392,6 +392,7 @@ extern int receive_keep_pack(int fd[2], const char *me, int quiet, int);
/* pager.c */
extern void setup_pager(void);
extern int pager_in_use;
extern int pager_use_color;
/* base85 */
int decode_85(char *dst, char *line, int linelen);