On Thu, Mar 05, 2015 at 09:59:14AM -0800, Ramon Fried wrote: > Like a lot of people, I have a .gitconfig which I share in different > locations (home, work, servers, etc) > At home, I have Beyond Compare and I use that as git diff tool. > At work I use vimdiff. > Is there a way to do a fallback in .gitconfig if bc3 (beyond compare > executable) is not found ? > > This is my current .gitconfig settings for beyondcompare. > [diff] > tool = bc3 > [difftool] > bc3 = trustExitCode > [merge] > tool = bc3 > [mergetool] > bc3 = trustExitCode
I'm not sure if there is, but a second best alternative might be [merge] tool = bc3 [mergetool] prompt = yes That way you're *always* prompted about what mergetool to use. /M -- Magnus Therning OpenPGP: 0xAB4DFBA4 email: mag...@therning.org jabber: mag...@therning.org twitter: magthe http://therning.org/magnus About the use of language: it is impossible to sharpen a pencil with a blunt axe. It is equally vain to try to do it with ten blunt axes instead. -- Edsger Dijkstra -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
Description: PGP signature