summaryrefslogtreecommitdiff
path: root/Documentation/config.txt
diff options
context:
space:
mode:
authorLibravatar Christian Couder <chriscool@tuxfamily.org>2008-03-07 08:46:55 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-03-11 23:02:01 -0700
commitb5578f333595e40cb843461e685c887ad2d01e5c (patch)
treedeafb32462331fd8df4787b990f4c8d8bb6f04cb /Documentation/config.txt
parenthelp: add "man.viewer" config var to use "woman" or "konqueror" (diff)
downloadtgif-b5578f333595e40cb843461e685c887ad2d01e5c.tar.xz
Documentation: help: describe 'man.viewer' config variable
Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Tested-by: Xavier Maillard <xma@gnu.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/config.txt')
-rw-r--r--Documentation/config.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index c5e094a9c4..d2f2d673ab 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -748,6 +748,10 @@ log.showroot::
Tools like linkgit:git-log[1] or linkgit:git-whatchanged[1], which
normally hide the root commit will now show it. True by default.
+man.viewer::
+ Specify the program that will be used to display help in the
+ 'man' format. See linkgit:git-help[1].
+
merge.summary::
Whether to include summaries of merged commits in newly created
merge commit messages. False by default.