Question

I am researching Git for VS 2013, and it seems pretty solid so far. However, it seems to be lacking customization options.

First question: With TFS and subversion (AnkhSVN) I am able to configure my own custom compare and merge tools (I am using CodeCompare, no affiliation, just a preference). Example for TFS:

enter image description here

There are no similar options with Git, even thought it's a Microsoft Git Provider. Am I missing a plugin?

enter image description here

Second question: I also could not find an option to do "Compare" with a double click. It is very unproductive to right-click and go to "Compare with unmodified" every time.

enter image description here

VS 2013 has a nice option to view only modified files, so I was going to use that + key or mouse combination (I've tried Shift-dblClick - no luck). Did anyone manage to discover such combination?

enter image description here

Was it helpful?

Solution

Trick at How to use an external diff tool for Git in Visual Studio 2013? has helped me to fix this issue.

    [diff]
    guitool = winmerge
        tool = winmerge

    [difftool "winmerge"]
        path = C:/Tools/WinMerge/WinMergeU.exe
        cmd = C:/Tools/WinMerge/WinMergeU.exe \"$LOCAL\" \"$REMOTE\"
Licensed under: CC-BY-SA with attribution
Not affiliated with StackOverflow
scroll top