diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-03-28 14:37:22 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-03-28 14:37:22 -0700 |
| commit | 18973d8ac9e396d0eefdf36d7c6aa43aa7d396a6 (patch) | |
| tree | 3dbfeddce403353b393042a812cfa2c669e54fbf /Documentation | |
| parent | d8355e5eaecddbcafdd66aa3d6433ae12f627177 (diff) | |
| parent | 02c56314aab9474827cd7831518a970f0341e4fd (diff) | |
| download | git-18973d8ac9e396d0eefdf36d7c6aa43aa7d396a6.tar.gz | |
Merge branch 'jk/difftool-dir-diff-edit-fix'
"git difftool --dir-diff" made symlinks to working tree files when
preparing a temporary directory structure, so that accidental edits
of these files in the difftool are reflected back to the working
tree, but the logic to decide when to do so was not quite right.
* jk/difftool-dir-diff-edit-fix:
difftool --dir-diff: symlink all files matching the working tree
difftool: avoid double slashes in symlink targets
git-difftool(1): fix formatting of --symlink description
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-difftool.txt | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Documentation/git-difftool.txt b/Documentation/git-difftool.txt index e0e12e9470..8361e6e4e3 100644 --- a/Documentation/git-difftool.txt +++ b/Documentation/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>:: |