Merge branch 'jn/editor-pager'

* jn/editor-pager:
Provide a build time default-pager setting
Provide a build time default-editor setting
am -i, git-svn: use "git var GIT_PAGER"
add -i, send-email, svn, p4, etc: use "git var GIT_EDITOR"
Teach git var about GIT_PAGER
Teach git var about GIT_EDITOR
Suppress warnings from "git var -l"
Do not use VISUAL editor on dumb terminals
Handle more shell metacharacters in editor names

diff --cc Documentation/config.txt
Simple merge

diff --cc Makefile
Simple merge

diff --cc cache.h
Simple merge

diff --cc git-add--interactive.perl
Simple merge

diff --cc git-svn.perl
Simple merge