difftool

Is there any way to view a merge that has already been committed in a 3-way diff? If a huge merge between branches was committed 3 weeks ago, is there any way I can see a 3-way diff of it in an external diff-tool like BeyondCompare3? I'm looking for just the files changed in the merge commit . Bonus if I could get it to only show me the conflicts and anything manually changed, as opposed to seeing the entire difference of a file between the two branches. I wouldn't mind settling for a 2-way diff if the left side had the <<<<< ===== >>>>> conflict markers and the right side was the committed

>>git difftool branch1 branch2 opens my difftool (Beyond Compare:BC) with every file that has a diff between the branches. I have to close BC after each file just for it to reopen with the next file. BC can diff whole directories and multiple files. Is there a way to get git difftool to open all files simultaneously, or diff the whole tree simultaneously? Olivier Refalo Starting with git v1.7.11, you can use git difftool --dir-diff to perform a directory diff. The answer that follows applies to git installations older than v1.7.11. This issue is not related to BC, but to the way git works.

I'm using Visual Studio 2013 and tfs 2013 . Sometimes I'll make a code change and click compare with latest version. The diff tool will open and allows me to edit the file in the diff tool. However other times it will not let me edit but will read only. Is there some setting or something I need to do for me always allow edit? In a database project I've noticed that it never lets me edit in the diff tool. Is there some setting I need to change? I've searched around online but haven't found any answers to this. Thank you. Editing in the Diff viewer is only allowed for certain file types. It

I am obviously overlooking something very simple here, but I am not seeing it. The command webstorm diff ~/test.txt ~/test2.txt runs the JetBrains graphical diff tool. I am running git 1.8.3.2 and have a git .config that includes [diff] tool = webstorm [difftool "webstorm"] cmd = webstorm diff $(cd $(dirname "$LOCAL") && pwd)/$(basename "$LOCAL") $(cd $(dirname "$REMOTE") && pwd)/$(basename "$REMOTE") [difftool] prompt = false and when I run the command git difftool ~/test.txt ~/test2.txt I get the following in the terminal window: diff --git a/home/mark/test.txt b/home/mark/test2.txt index

Has anyone ever made Meld work with Git on Windows? I am trying to make it work and I have no success. I have Meld installed and when I call it from the command line with two files as parameters it diffs them well so Meld is installed correctly. However I can't make it work with Git (Git Diff). I use version git version 1.8.1.msysgit.1 of Git. I have tried several things: I created a shell script, meld.sh : #!/bin/bash meld.exe "$2" "$5" echo $2 echo $5 and used it from Git: [diff] tool = meld [difftool "meld"] cmd = \"D:\\meld.sh\" I tried to add it as a difftool like this: [diff] tool = meld

I configured git like this: git config --global diff.tool meld When I run: git difftool I get the following message: Viewing: 'hello.txt' Hit return to launch 'meld': Then, if I press Enter , meld will launch. How can I disable this message, so that meld will be launched straight away after typing git difftool ? man git-difftool OPTIONS -y, --no-prompt Do not prompt before launching a diff tool. ZJR 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

This question is based on VonC's comment at the thread . Is Git's auto-detection for difftool or mergetool scripted or is it within some Git executable? It's scripted in git-mergetool. I found this at line 344 of my copy. if test -z "$merge_tool"; then merge_tool=`git config merge.tool` if test -n "$merge_tool" && ! valid_tool "$merge_tool"; then echo >&2 "git config option merge.tool set to unknown tool: $merge_tool" echo >&2 "Resetting to default..." unset merge_tool fi fi if test -z "$merge_tool" ; then if test -n "$DISPLAY"; then merge_tool_candidates="kdiff3 tkdiff xxdiff meld gvimdiff"

I can get winmerge to show me diffs for modified file. But for new files, winmerge gives a dialog saying 'Left path is invalid!'. I want it to show the left pane as empty and right pane with the contents of the file. $ git difftool head^ newfile.txt winmerge Dialog: I'm on git version 2.8.2.windows.1 This is my git config for difftool: [diff] tool = winmerge [difftool] prompt = false [difftool "winmerge"] cmd = \"C:\\Program Files (x86)\\WinMerge\\WinMergeU.exe\" -e -ub -wl \"$LOCAL\" \"$REMOTE\" What am I missing? I could not find this exact workaround so I'm posting this. Hopefully, someone