difftool--helper: Remove use of the GIT_MERGE_TOOL variable

[git.git] / git-am.sh

diff --git a/git-am.sh b/git-am.sh
index f48620d5bc1dfba2012b3a7c06477f97ddef9282..4838cdb9ede8765b37ab663aa59fb1b011a30b4c 100755 (executable)
--- a/git-am.sh
+++ b/git-am.sh
@@ -657,7 +657,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