issues faster

Database Tools

Must-have SQL Server tools and tools for MySQL, Oracle, and PostgreSQL database development, management and administration

Data Connectivity

The most trusted solutions for your data connectivity needs: ADO.NET, ODBC, SSIS, Excel, dbExpress, Delphi Components

Productivity Tools

Write code, create reviews, compare sources, track the working hours with the web app, utilize the power of ORM Solutions

Data Services

Data integration, online backup, web-based SQL tools, cloud connectivity solution
Previous Next

Code Compare Integration with GIT

To use Code Compare with Git, you need to add the following lines to the gitconfig file:

		    [difftool "codecompare"]
			cmd = 'C:\\Program Files\\Devart\\Code Compare\\codecompare.exe' -W \"$LOCAL\" \"$REMOTE\" 
			renames = true
            tool = codecompare
            guitool = codecompare
		    [mergetool "codecompare"]
		    cmd = 'C:\\Program Files\\Devart\\Code Compare\\codemerge.exe' -MF \"$LOCAL\" -TF \"$REMOTE\" -BF \"$BASE\" -RF \"$MERGED\" 
            trustExitCode = true
            keepBackup = false
            tool = codecompare
            guitool = codecompare

Note: The global gitconfig file is located in C:\Users\MyLogin\.gitconfig. The config file for a local repository is located in repository root in the ".git" folder (this folder is hidden by default).

For a brief introduction to the features of our diff and merge tool, refer to the product's overview page.