Git Configs

git config --global user.name "Tarcisio Coutinho"
git config --global user.email "[email protected]"

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'


--------------------------------------------------------------------------------------------

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\"'