diff options
| author |  Kenichi Saita <nitoyon@gmail.com> | 2013-05-30 01:01:23 +0900 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2013-05-29 12:50:08 -0700 |
| commit | 32eaf1de7f79c4ba09f3de3261c84e52e0a67af5 (patch) | |
| tree | 116a16ece696460c5bcb469ddfe3740d5aa5e6f4 /hex.c | |
| parent | Git 1.8.3 (diff) | |
| download | tgif-32eaf1de7f79c4ba09f3de3261c84e52e0a67af5.tar.xz | |
difftool --dir-diff: allow changing any clean working tree file
The temporary directory prepared by "difftool --dir-diff" to
show the result of a change can be modified by the user via
the tree diff program, and we try hard not to lose changes
to them after tree diff program returns to us.
However, the set of files to be copied back is computed
differently between --symlinks and --no-symlinks modes. The
former checks all paths that start out as identical to the
working tree file, while the latter checks paths that
already had a local modification in the working tree,
allowing changes made in the tree diff program to paths that
did not have any local change to be lost.
Signed-off-by: Kenichi Saita <nitoyon@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'hex.c')
0 files changed, 0 insertions, 0 deletions