Menu
Is there a way to go back to the default settings regarding the Diff & Merge Tools in the Git Settings window ?
My Visual Studio Git Settings windows view is currently this:
Team Explorer - Git Settings
641
Specify a custom command for viewing diffs. git-difftool ignores the configured defaults and runs $command $LOCAL $REMOTE when this option is specified. Additionally, $BASE is set in the environment. When git-difftool is invoked with the -g or --gui option the default diff tool will be read from the configured diff.
Go to your repository in Git Bash. Type git config diff. tool winmerge . Verify it worked by typing git difftool .
man git-difftool OPTIONS -y, --no-prompt Do not prompt before launching a diff tool.
The default Diff Tool is vimdiff. Specifying a Diff Tool affects the git difftool command. The command git diff still performs diffing on the command-line.
These settings are controlled from your git configuration settings. There isn't a way to unset this in Visual Studio, but you can modify the git configurations.
You can modify these settings via the git commands on the command line. Open a command prompt and type one of the following commands (use the global switch, as it appears you have this set globally in the screen shot):
git config --edit --global
and remove the line for "tool" in the diff and merge sections.
Alternatively, you can remove the settings from the command line via the following git commands:
git config --global --unset diff.tool
git config --global --unset merge.tool
If you are on the Git Settings Team Explorer page when you unset the above values, you will need to manually refresh the page in order for it to pick up the changes (hit F5, or press the refresh button on the top of the Team Explorer page).
81
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With
