summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-09-03 00:45:41 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-09-03 00:45:41 (GMT)
commitf3db366770ffc67196ee13cdcb65c6bfb45821f6 (patch)
tree13521d9696bdefafc7266e8d57d050c061151cc4 /Documentation
parent1c12b38601b5b4da61a2e90540a8de56261d93af (diff)
parent5059a427804f9fefaf75dd1aa92cb620ce9219c7 (diff)
downloadgit-f3db366770ffc67196ee13cdcb65c6bfb45821f6.zip
git-f3db366770ffc67196ee13cdcb65c6bfb45821f6.tar.gz
git-f3db366770ffc67196ee13cdcb65c6bfb45821f6.tar.bz2
Merge branch 'rf/man-env'
* rf/man-env: builtin-help: fallback to GIT_MAN_VIEWER before man
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-help.txt4
1 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/git-help.txt b/Documentation/git-help.txt
index f414583..d9b9c34 100644
--- a/Documentation/git-help.txt
+++ b/Documentation/git-help.txt
@@ -112,7 +112,9 @@ For example, this configuration:
will try to use konqueror first. But this may fail (for example if
DISPLAY is not set) and in that case emacs' woman mode will be tried.
-If everything fails the 'man' program will be tried anyway.
+If everything fails, or if no viewer is configured, the viewer specified
+in the GIT_MAN_VIEWER environment variable will be tried. If that
+fails too, the 'man' program will be tried anyway.
man.<tool>.path
~~~~~~~~~~~~~~~