isurfbecause
isurfbecause

Reputation: 990

Too many diff.tool values

enter image description here

I am trying to use beyond compare with git as my diff tool (probably merge later). I've tried tutorials from Tim's Blog and Beyond Compare Website

Now I have too many copies of diff.tool variables. I deleted everything in my config files, C:\Program Files (x86)\Git\etc\gitconfig and current git repo I am in.

Is there a way to delete all the variables? If so where can I find them?

Upvotes: 0

Views: 293

Answers (1)

Adam Dymitruk
Adam Dymitruk

Reputation: 129664

there is also the global config

~/.git/config

and then per repo in

yourrepo/.git/config

you can specify which config with --local, --global or --system when you issue the config command. --local is implied if you don't specify scope explicitly.

Upvotes: 2

Related Questions