Merge branch 'gb/1.7.0-diff-whitespace-only-output'

diff --git a/Documentation/git-var.txt b/Documentation/git-var.txt
index 89e4b4fa0c7c8378cbce46ba8ef460777b3114e7..ef6aa81872eb9e67eaf8183cfd5359d97e6c772b 100644 (file)
--- a/Documentation/git-var.txt
+++ b/Documentation/git-var.txt
@@ -44,6 +44,12 @@ GIT_EDITOR::
     environment variable, then `core.editor` configuration, then
     `$VISUAL`, then `$EDITOR`, and then finally 'vi'.
 
+GIT_PAGER::
+    Text viewer for use by git commands (e.g., 'less').  The value
+    is meant to be interpreted by the shell.  The order of preference
+    is the `$GIT_PAGER` environment variable, then `core.pager`
+    configuration, then `$PAGER`, and then finally 'less'.
+
 Diagnostics
 -----------
 You don't exist. Go away!::