Skip to content

Instantly share code, notes, and snippets.

@drugan

drugan/extMerge Git merging tool.md

Last active June 21, 2022 22:31
Show Gist options
  • Star 1 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save drugan/72ddb1a7f0d6db14dcb7b59825b37928 to your computer and use it in GitHub Desktop.
Save drugan/72ddb1a7f0d6db14dcb7b59825b37928 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
extMerge Git merging tool.md

Set up extMerge as the merging tool

Open your .gitconfig and put this into the file:

[merge]  
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:

[diff]  
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