diff mbox series

[17/59] config.txt: move difftool.* to a separate file

Message ID 20181020123848.2785-18-pclouds@gmail.com
State New, archived
Headers show
Series Split config.txt | expand

Commit Message

Duy Nguyen Oct. 20, 2018, 12:38 p.m. UTC
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
 Documentation/config.txt          | 15 +--------------
 Documentation/difftool-config.txt | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 14 deletions(-)
 create mode 100644 Documentation/difftool-config.txt
diff mbox series

Patch

diff --git a/Documentation/config.txt b/Documentation/config.txt
index d1509dd25e..f38e0a8334 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -321,20 +321,7 @@  include::completion-config.txt[]
 
 include::diff-config.txt[]
 
-difftool.<tool>.path::
-	Override the path for the given tool.  This is useful in case
-	your tool is not in the PATH.
-
-difftool.<tool>.cmd::
-	Specify the command to invoke the specified diff tool.
-	The specified command is evaluated in shell with the following
-	variables available:  'LOCAL' is set to the name of the temporary
-	file containing the contents of the diff pre-image and 'REMOTE'
-	is set to the name of the temporary file containing the contents
-	of the diff post-image.
-
-difftool.prompt::
-	Prompt before each invocation of the diff tool.
+include::difftool-config.txt[]
 
 fastimport.unpackLimit::
 	If the number of objects imported by linkgit:git-fast-import[1]
diff --git a/Documentation/difftool-config.txt b/Documentation/difftool-config.txt
new file mode 100644
index 0000000000..6762594480
--- /dev/null
+++ b/Documentation/difftool-config.txt
@@ -0,0 +1,14 @@ 
+difftool.<tool>.path::
+	Override the path for the given tool.  This is useful in case
+	your tool is not in the PATH.
+
+difftool.<tool>.cmd::
+	Specify the command to invoke the specified diff tool.
+	The specified command is evaluated in shell with the following
+	variables available:  'LOCAL' is set to the name of the temporary
+	file containing the contents of the diff pre-image and 'REMOTE'
+	is set to the name of the temporary file containing the contents
+	of the diff post-image.
+
+difftool.prompt::
+	Prompt before each invocation of the diff tool.