summaryrefslogtreecommitdiff
path: root/git-am.sh
diff options
context:
space:
mode:
authorJonathan Nieder <jrnieder@gmail.com>2009-10-31 01:43:19 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-11-13 20:20:52 (GMT)
commitdec543e62dbc47be0c06805330a20f7fa9f699a3 (patch)
tree5fb0e263b8ba9cbcfab0253a095271bc41f2fa19 /git-am.sh
parentb4479f074760a788dd4e353b8c86a7d735afc53e (diff)
downloadgit-dec543e62dbc47be0c06805330a20f7fa9f699a3.zip
git-dec543e62dbc47be0c06805330a20f7fa9f699a3.tar.gz
git-dec543e62dbc47be0c06805330a20f7fa9f699a3.tar.bz2
am -i, git-svn: use "git var GIT_PAGER"
Use the new "git var GIT_PAGER" command to ask what pager to use. Without this change, the core.pager configuration is ignored by these commands. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-am.sh')
-rwxr-xr-xgit-am.sh5
1 files changed, 4 insertions, 1 deletions
diff --git a/git-am.sh b/git-am.sh
index c132f50..2649487 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -649,7 +649,10 @@ do
[eE]*) git_editor "$dotest/final-commit"
action=again ;;
[vV]*) action=again
- LESS=-S ${PAGER:-less} "$dotest/patch" ;;
+ : ${GIT_PAGER=$(git var GIT_PAGER)}
+ : ${LESS=-FRSX}
+ export LESS
+ $GIT_PAGER "$dotest/patch" ;;
*) action=again ;;
esac
done