Skip to content

Commit

Permalink
config.txt: move difftool.* to a separate file
Browse files Browse the repository at this point in the history
Signed-off-by: Nguyễn Thái Ngọc Duy <[email protected]>
Signed-off-by: Junio C Hamano <[email protected]>
  • Loading branch information
pclouds authored and gitster committed Oct 29, 2018
1 parent fa922d7 commit 9155f6f
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 14 deletions.
15 changes: 1 addition & 14 deletions Documentation/config.txt
Original file line number Diff line number Diff line change
Expand Up @@ -321,20 +321,7 @@ include::config/completion.txt[]

include::config/diff.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::config/difftool.txt[]

fastimport.unpackLimit::
If the number of objects imported by linkgit:git-fast-import[1]
Expand Down
14 changes: 14 additions & 0 deletions Documentation/config/difftool.txt
Original file line number Diff line number Diff line change
@@ -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.

0 comments on commit 9155f6f

Please sign in to comment.