aboutsummaryrefslogtreecommitdiff
path: root/Documentation/config.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-03-15 01:10:32 -0700
committerJunio C Hamano <gitster@pobox.com>2008-03-15 01:10:32 -0700
commit50c2b54b23e0d7df40bd8739c1c96df42c47f280 (patch)
tree5e0c516d7457e4f6f422833ab8b457afa245f63e /Documentation/config.txt
parentabe549e1791822b3105648452b1f8907f8fdb26a (diff)
parent63f671a4406f33bf689d854596124a40f5b9a22a (diff)
downloadgit-50c2b54b23e0d7df40bd8739c1c96df42c47f280.tar.gz
git-50c2b54b23e0d7df40bd8739c1c96df42c47f280.tar.xz
Merge branch 'cc/help'
* cc/help: Documentation/git-help: typofix help: warn if specified 'man.viewer' is unsupported, instead of erroring out Documentation: help: explain 'man.viewer' multiple values help: implement multi-valued "man.viewer" config option Documentation: help: describe 'man.viewer' config variable help: add "man.viewer" config var to use "woman" or "konqueror"
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 ed2cb832b..0865f4e01 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -757,6 +757,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 programs that may 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.