Skip to content

Instantly share code, notes, and snippets.

What would you like to do?

Set up extMerge as the merging tool

Open your .gitconfig and put this into the file:

tool = extMerge  
[mergetool "extMerge"]  
cmd = extMerge "$BASE" "$LOCAL" "$REMOTE" "$MERGED"  
trustExitCode = false

Then, run this wnen you need to merge some modifications:

git mergetool

The same with diff. Instead of viewing diff in the console you may view and edit modifications in the extDiff window. Put this into .gitconfig:

external = extDiff

Then, run this:

git diff

Also, git gui and gitk commands might be found useful by some users when working with git.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment