Merge branch 'jn/maint-fix-pager'

* jn/maint-fix-pager:
  tests: Fix race condition in t7006-pager
  t7006-pager: if stdout is not a terminal, make a new one
  tests: Add tests for automatic use of pager
  am: Fix launching of pager
  git svn: Fix launching of pager
  git.1: Clarify the behavior of the --paginate option
  Make 'git var GIT_PAGER' always print the configured pager
  Fix 'git var' usage synopsis

diff --cc Documentation/git.txt
Simple merge

diff --cc git-am.sh
Simple merge

diff --cc git-sh-setup.sh
index 5e22440aecc4aa57455ce836624f5fe17b6d1f73,44fb4670aed97fb4eebc2c8985dff9c363732507..7a095665d71f153a970243a9d03d919ddef29c88
mode 100644,100755..100644
--- 1/git-sh-setup.sh
--- 2/git-sh-setup.sh
+++ b/git-sh-setup.sh

diff --cc git-svn.perl
Simple merge