diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-03-05 06:27:04 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-03-05 06:27:04 (GMT) |
| commit | 6914c661c3652e22fc2971bfefd36fddad56233a (patch) | |
| tree | 7ea31eb6ed4e6a2fb0882f49db0c46cd19671e77 /git-mergetool--lib.sh | |
| parent | 712d352577012d5035da69bbf49ea0f0df8bb7da (diff) | |
| parent | 8c33b4cf67f47ee46fe0984751fd40c4cf7cf392 (diff) | |
| download | git-6914c661c3652e22fc2971bfefd36fddad56233a.zip git-6914c661c3652e22fc2971bfefd36fddad56233a.tar.gz git-6914c661c3652e22fc2971bfefd36fddad56233a.tar.bz2 | |
Merge branch 'jn/maint-fix-pager' into maint
* 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
Diffstat (limited to 'git-mergetool--lib.sh')
0 files changed, 0 insertions, 0 deletions