config.txt: move difftool.* 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>
Nguyễn Thái Ngọc Duy committed
Oct 27, 2018 at 08:22 UTC
9155f6f670f152bee38cb48b4db5348f34b51e60
2 files changed
+15
-14
Documentation/config.txt
+1
-14
@@ -321,20 +321,7 @@ include::config/completion.txt[]
321
322
include::config/diff.txt[]
323
324
-difftool.<tool>.path::
325
- Override the path for the given tool. This is useful in case
326
- your tool is not in the PATH.
327
-
328
-difftool.<tool>.cmd::
329
- Specify the command to invoke the specified diff tool.
330
- The specified command is evaluated in shell with the following
331
- variables available: 'LOCAL' is set to the name of the temporary
332
- file containing the contents of the diff pre-image and 'REMOTE'
333
- is set to the name of the temporary file containing the contents
334
- of the diff post-image.
335
-
336
-difftool.prompt::
337
- Prompt before each invocation of the diff tool.
324
+include::config/difftool.txt[]
325
326
fastimport.unpackLimit::
327
If the number of objects imported by linkgit:git-fast-import[1]
Documentation/config/difftool.txt
new
+14
@@ -0,0 +1,14 @@
1
+difftool.<tool>.path::
2
+ Override the path for the given tool. This is useful in case
3
+ your tool is not in the PATH.
4
+
5
+difftool.<tool>.cmd::
6
+ Specify the command to invoke the specified diff tool.
7
+ The specified command is evaluated in shell with the following
8
+ variables available: 'LOCAL' is set to the name of the temporary
9
+ file containing the contents of the diff pre-image and 'REMOTE'
10
+ is set to the name of the temporary file containing the contents
11
+ of the diff post-image.
12
+
13
+difftool.prompt::
14
+ Prompt before each invocation of the diff tool.