Last active
September 24, 2015 20:26
-
-
Save felipebizz/6d0fa58790ceec3e5f8c to your computer and use it in GitHub Desktop.
Configuration Meld on Git
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
#install the Meld in your terminal | |
apt-get install meld | |
#Do Download of file git_mergetool_opt.sh | |
https://gist.github.com/felipebizz/a7a54b4f6a3e091925f5 | |
#Let this file in ~/ | |
#open your file gitconfig and add this piece of code | |
[mergetool "git_mergetool_opt"] | |
cmd = /home/felipe/git_mergetool_opt.sh "$BASE" "$LOCAL" "$REMOTE" "$MERGED" | |
keepTemporaries = false | |
trustExitCode = false | |
keepBackup = false | |
[alias] df = diff HEAD | |
[alias] dft = difftool HEAD |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment