Skip to content

Instantly share code, notes, and snippets.

@tacsio tacsio/Git Configs
Last active Dec 31, 2017

Embed
What would you like to do?
My git config
git config --global user.name "Tarcisio Coutinho"
git config --global user.email "tcs5cin@gmail.com"
git config --global color.ui true
git config --global alias.s status
git config --global alias.c checkout
git config --global alias.b branch
git config --global alias.lol log --oneline --graph --decorate
git config --global merge.tool meld
git config --global mergetool.meld.cmd meld '$BASE $LOCAL $REMOTE $MERGED'
git config --global mergetool.meld.trustExitCode false
git config --global diff.tool meld
git config --global difftool.meld.cmd meld '$LOCAL $REMOTE'
@tacsio

This comment has been minimized.

Copy link
Owner Author

tacsio commented Mar 10, 2013

Windows merge tool config: (meld.exe needs to be on PATH)

git config --global merge.tool meld
git config --global mergetool.meld.cmd 'meld.exe "$BASE" "$LOCAL" "$REMOTE" "$MERGED"'

git config --global diff.tool meld
git config --global difftool.meld.cmd 'meld.exe "$LOCAL" "$REMOTE"'

@lpgarzonr

This comment has been minimized.

Copy link

lpgarzonr commented Feb 9, 2016

Thanks a lot, it works!

@sjparkinson

This comment has been minimized.

Copy link

sjparkinson commented Jul 20, 2016

For linux I needed to double quote the variables, my ~/.gitconfig looked something like

[merge]
    tool = meld
[mergetool "meld"]
    cmd = meld "$BASE $LOCAL $REMOTE $MERGED"
    trustExitCode = false
[diff]
    tool = meld
[difftool "meld"]
    cmd = meld "$LOCAL $REMOTE"
@tacsio

This comment has been minimized.

Copy link
Owner Author

tacsio commented Dec 18, 2017

Nice!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.