diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-03-28 16:24:30 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-03-28 16:24:30 -0700 |
| commit | 778a3411f5a5c0dd8a7a6bb51c9451590ad706cb (patch) | |
| tree | c10dd41f6ceecd0a2692f5d2694cb2e9b660f331 /git-difftool.txt | |
| parent | 09cfe6f8345e8ab347de8af492c34b5850b9b409 (diff) | |
| download | git-htmldocs-778a3411f5a5c0dd8a7a6bb51c9451590ad706cb.tar.gz | |
Autogenerated HTML docs for v1.8.2-279-g631bc
Diffstat (limited to 'git-difftool.txt')
| -rw-r--r-- | git-difftool.txt | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/git-difftool.txt b/git-difftool.txt index e0e12e947..8361e6e4e 100644 --- a/git-difftool.txt +++ b/git-difftool.txt @@ -72,10 +72,12 @@ with custom merge tool commands and has the same value as `$MERGED`. --symlinks:: --no-symlinks:: 'git difftool''s default behavior is create symlinks to the - working tree when run in `--dir-diff` mode. + working tree when run in `--dir-diff` mode and the right-hand + side of the comparison yields the same content as the file in + the working tree. + - Specifying `--no-symlinks` instructs 'git difftool' to create - copies instead. `--no-symlinks` is the default on Windows. +Specifying `--no-symlinks` instructs 'git difftool' to create copies +instead. `--no-symlinks` is the default on Windows. -x <command>:: --extcmd=<command>:: |