Skip to content

Instantly share code, notes, and snippets.

@juliozuppa
Forked from tacsio/Git Configs
Last active August 29, 2015 14:03
Show Gist options
  • Save juliozuppa/a0ef24ef2bc9e1dea99e to your computer and use it in GitHub Desktop.
Save juliozuppa/a0ef24ef2bc9e1dea99e to your computer and use it in GitHub Desktop.
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\"'
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment