aboutsummaryrefslogtreecommitdiff
path: root/diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-06-06 16:58:40 -0700
committerJunio C Hamano <junkio@cox.net>2006-07-09 03:27:03 -0700
commit85fb65ed6e41e93760a91b33b512d3d9dc67ac66 (patch)
treee8b00ceee2a8b5880d192609ac80ebfbbeeb0a6d /diff.c
parentcfc01c038709e4cdbf506d29937cac2bc1b76d39 (diff)
downloadgit-85fb65ed6e41e93760a91b33b512d3d9dc67ac66.tar.gz
git-85fb65ed6e41e93760a91b33b512d3d9dc67ac66.tar.xz
"git -p cmd" to page anywhere
This allows you to say: git -p diff v2.6.16-rc5.. and the command pipes the output of any git command to your pager. [jc: this resurrects a month old RFC patch with improvement suggested by Linus to call it --paginate instead of --less.] Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'diff.c')
-rw-r--r--diff.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/diff.c b/diff.c
index 3e26180f0..a00f9d1e5 100644
--- a/diff.c
+++ b/diff.c
@@ -112,7 +112,7 @@ int git_diff_config(const char *var, const char *value)
diff_use_color_default = 1; /* bool */
else if (!strcasecmp(value, "auto")) {
diff_use_color_default = 0;
- if (isatty(1)) {
+ if (isatty(1) || pager_in_use) {
char *term = getenv("TERM");
if (term && strcmp(term, "dumb"))
diff_use_color_default = 1;