-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
config.txt: move difftool.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
- Loading branch information
Showing
2 changed files
with
15 additions
and
14 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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. |