diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2018-10-27 06:22:52 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-10-29 01:17:01 (GMT) |
| commit | 9155f6f670f152bee38cb48b4db5348f34b51e60 (patch) | |
| tree | 61caad118fc13a089d929f6236d3c9d64f269e38 /Documentation/config/difftool.txt | |
| parent | fa922d74c525a8f66584e50b60b8dfc3cd237a90 (diff) | |
| download | git-9155f6f670f152bee38cb48b4db5348f34b51e60.zip git-9155f6f670f152bee38cb48b4db5348f34b51e60.tar.gz git-9155f6f670f152bee38cb48b4db5348f34b51e60.tar.bz2 | |
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>
Diffstat (limited to 'Documentation/config/difftool.txt')
| -rw-r--r-- | Documentation/config/difftool.txt | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/Documentation/config/difftool.txt b/Documentation/config/difftool.txt new file mode 100644 index 0000000..6762594 --- /dev/null +++ b/Documentation/config/difftool.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. |