diff options
| author |  John Keeping <john@keeping.me.uk> | 2013-03-14 20:19:41 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2013-03-14 14:33:06 -0700 |
| commit | 02c56314aab9474827cd7831518a970f0341e4fd (patch) | |
| tree | cff228e8a5dbda54e75153ca7995a15386260529 /Documentation/git-difftool.txt | |
| parent | difftool: avoid double slashes in symlink targets (diff) | |
| download | tgif-02c56314aab9474827cd7831518a970f0341e4fd.tar.xz | |
difftool --dir-diff: symlink all files matching the working tree
Some users like to edit files in their diff tool when using "git
difftool --dir-diff --symlink" to compare against the working tree but
difftool currently only created symlinks when a file contains unstaged
changes.
Change this behaviour so that symlinks are created whenever the
right-hand side of the comparison has the same SHA1 as the file in the
working tree.
Note that textconv filters are handled in the same way as by git-diff
and if a clean filter is not the inverse of its smudge filter we already
get a null SHA1 from "diff --raw" and will symlink the file without
going through the new hash-object based check.
Signed-off-by: John Keeping <john@keeping.me.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-difftool.txt')
| -rw-r--r-- | Documentation/git-difftool.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/git-difftool.txt b/Documentation/git-difftool.txt index e575fea1ad..8361e6e4e3 100644 --- a/Documentation/git-difftool.txt +++ b/Documentation/git-difftool.txt @@ -72,7 +72,9 @@ 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. |