summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Nguyễn Thái Ngọc Duy <pclouds@gmail.com>2018-10-27 08:23:18 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-10-29 10:17:03 +0900
commitf7ade6c98045d27039a76691657d2fbf08e527fc (patch)
treeebe80a75e8f811a7bfbadf5c175281e1c02b1ff3 /Documentation
parentconfig.txt: move mailmap.* to a separate file (diff)
downloadtgif-f7ade6c98045d27039a76691657d2fbf08e527fc.tar.xz
config.txt: move man.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/config.txt13
-rw-r--r--Documentation/config/man.txt12
2 files changed, 13 insertions, 12 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index ff9c8797a6..c3c92bc269 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -369,18 +369,7 @@ include::config/mailinfo.txt[]
include::config/mailmap.txt[]
-man.viewer::
- Specify the programs that may be used to display help in the
- 'man' format. See linkgit:git-help[1].
-
-man.<tool>.cmd::
- Specify the command to invoke the specified man viewer. The
- specified command is evaluated in shell with the man page
- passed as argument. (See linkgit:git-help[1].)
-
-man.<tool>.path::
- Override the path for the given tool that may be used to
- display help in the 'man' format. See linkgit:git-help[1].
+include::config/man.txt[]
include::merge-config.txt[]
diff --git a/Documentation/config/man.txt b/Documentation/config/man.txt
new file mode 100644
index 0000000000..a727d987a8
--- /dev/null
+++ b/Documentation/config/man.txt
@@ -0,0 +1,12 @@
+man.viewer::
+ Specify the programs that may be used to display help in the
+ 'man' format. See linkgit:git-help[1].
+
+man.<tool>.cmd::
+ Specify the command to invoke the specified man viewer. The
+ specified command is evaluated in shell with the man page
+ passed as argument. (See linkgit:git-help[1].)
+
+man.<tool>.path::
+ Override the path for the given tool that may be used to
+ display help in the 'man' format. See linkgit:git-help[1].