• John Keeping's avatar
    difftool --dir-diff: symlink all files matching the working tree · 02c56314
    John Keeping authored
    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
    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's avatarJohn Keeping <john@keeping.me.uk>
    Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
git-difftool.txt 4.03 KB