difftool

I prefer to use meld as the diff tool. However it doesn't have an option to quickly solve all simple conflicts so in case of merging I'd like to use kdiff3 I've set merge.tool to kdiff3 and diff.guitool to meld but git difftool still always run kdiff3 [merge] tool = kdiff3 conflictstyle = diff3 [diff] guitool = meld renames = copies mnemonicPrefix = true [difftool] prompt = false How to make git difftool run meld ? diff.guitool only applies if you use the --gui flag . Setting diff.tool and merge.tool should make git difftool and git mergetool use different tools: [merge] tool = kdiff3 [diff]

In Mercurial, one can define a pattern for external diff and merge tools (so that they are called only for files matching the pattern specified): [diff-patterns] **.ext = difftool [merge-patterns] **.ext = mergetool How to define such patterns in Git? [mergetool] section in git-config(1) does not mention any pattern, mask or anyting similar. EDIT : Here is a relevant part of my .git/config: [diff] tool = difftool [difftool "difftool"] cmd = difftool.git.sh "$LOCAL" "$REMOTE" "$BASE" [merge] tool = mergetool [mergetool "mergetool"] cmd = mergetool.git.sh "$LOCAL" "$REMOTE" "$BASE" "$MERGED" Now

This question already has answers here : Show both staged & working tree in git diff? (3 answers) Is there a way of viewing the differences between the staged and unstaged versions of the same file? For example: Changes to be committed: modified: conf/application.conf Changes not staged for commit: (use "git add/rm <file>..." to update what will be committed) (use "git checkout -- <file>..." to discard changes in working directory) modified: conf/application.conf This happens when I stage a change and then I modify the file again, without staging it. EDIT The git status -vv command is not good

I want to use meld as my diff tool for git. If I configure my .gitconfig like this : [difftool] prompt = false [diff] tool = meld and run command : $ git difftool then git open a meld window for each file which have changes. But I want one single window with all my files in the meld list box. I have read a little about -d or --dir-diff option. When I try : $ git difftool -d then a single windows is opened with one directory tree in each meld part, but either contain empty directories. I can not open my files from here. For infomation : $ git --version git version 1.9.1 $ meld --version meld 1

Is there an easy way to compare the file tree of an old git commit with the working file tree, in meld? git-difftool does something very similar, but I don't want it to actually do any diffing; the whole point is that the tool it is calling can provide a better interface for that. I've tested this on a recent version of meld and it is now built in. You can use it with meld <directory path> so "meld ." works for the current directory. You can checkout a version git co [version] then git reset [version]^ and then run "meld ." to compare any version with it's previous version. With git > 1.7.11 ,