From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 2 Mar 2010 20:44:11 +0000 (-0800)
Subject: Merge branch 'jn/maint-fix-pager'
X-Git-Tag: v1.7.1-rc0~106
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=52ebb06f1466a235c643acffdea9c9e484cfdec0;p=thirdparty%2Fgit.git

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
---

52ebb06f1466a235c643acffdea9c9e484cfdec0
diff --cc git-sh-setup.sh
index 5e22440aec,44fb4670ae..7a095665d7
mode 100644,100755..100644
--- a/git-sh-setup.sh
+++ b/git-sh-setup.sh