diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-08-27 14:11:23 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-08-27 14:11:23 -0700 |
| commit | a00504d4382d1ae561f4199e9d3bcf65a8045ecd (patch) | |
| tree | 02c2f48bdefba25f947ea52b29fdddda57f18f5d /git-difftool.txt | |
| parent | b9dc76c4ad0987d352a0d26620978a14e8f09714 (diff) | |
| download | git-htmldocs-a00504d4382d1ae561f4199e9d3bcf65a8045ecd.tar.gz | |
Autogenerated HTML docs for v1.7.12-116-g31e0100
Diffstat (limited to 'git-difftool.txt')
| -rw-r--r-- | git-difftool.txt | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/git-difftool.txt b/git-difftool.txt index 31fc2e3ae..73ca7025a 100644 --- a/git-difftool.txt +++ b/git-difftool.txt @@ -69,6 +69,14 @@ with custom merge tool commands and has the same value as `$MERGED`. --tool-help:: Print a list of diff tools that may be used with `--tool`. +--symlinks:: +--no-symlinks:: + 'git difftool''s default behavior is create symlinks to the + working tree when run in `--dir-diff` mode. ++ + Specifying `--no-symlinks` instructs 'git difftool' to create + copies instead. `--no-symlinks` is the default on Windows. + -x <command>:: --extcmd=<command>:: Specify a custom command for viewing diffs. |