Updated answer: My original version of the script below was flawed in the sense that $conflicting_files in fact did not contain only the files that really had conflicts, but all files that were changed in both parent branches (but not necessarily had conflicts). Also, it was not using “the configured merge tool” as advertized in … Read more
there are 4 components to this (note that before this step, you would have already done a local-checkin.) The local-checkin that your git tree has: LOCAL The head of the remote repository (that is going to be merged): REMOTE common ancestor to both LOCAL and REMOTE: BASE The file that will be written as a … Read more
You are talking about merge tool, yet you (and some other people with answers) are configuring it as a diff tool. To configure a merge tool, you’d need to use merge.tool and mergetool configurations instead of diff.tool and difftool, like this: git config –global merge.tool winmerge git config –replace –global mergetool.winmerge.cmd “\”C:\Program Files (x86)\WinMerge\WinMergeU.exe\” -e … Read more
There’s also an option: difftool.prompt Prompt before each invocation of the diff tool. The following command turns off the prompt globally (for all repos): git config –global difftool.prompt false Which is like writing in ~/.gitconfig: (or in %HOMEDRIVE%%HOMEPATH%\.gitconfig) [difftool] prompt = false
Starting with git v1.7.11, you can use git difftool –dir-diff to perform a directory diff. This feature works well with Meld 3.14.2 for example, and lets you browse all modified files: git difftool –dir-diff –tool=meld HEAD~ HEAD This is a handy Bash function: git-diff-meld() ( git difftool –dir-diff –tool=meld “${1:-HEAD~}” “${2:-HEAD}” ) The answer that … Read more
Since Git1.6.3, you can use the git difftool script: see my answer below. May be this article will help you. Here are the best parts: There are two different ways to specify an external diff tool. The first is the method you used, by setting the GIT_EXTERNAL_DIFF variable. However, the variable is supposed to point … Read more