| commit | e68014a8e82477762b2c59fcdb81747fea4afd57 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 19 Mar 2013 22:57:21 +0000 (19 15:57 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 19 Mar 2013 22:57:22 +0000 (19 15:57 -0700) | ||
| tree | 4ca60d33c213049eaacbfddf1f70808d86c2c3a2 | treesnapshot (tar.gz zip) |
| parent | b063a55271beb1eaa00b8ca1ecfe554cef8b39ba | commitdiff |
| parent | 02c56314aab9474827cd7831518a970f0341e4fd | commitdiff |
Merge branch 'jk/difftool-dir-diff-edit-fix' into next
"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
"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
| git-difftool.perl | diff1 | diff2 | blobhistory |
| t/t7800-difftool.sh | diff1 | diff2 | blobhistory |