Skip to content

Instantly share code, notes, and snippets.

@alexbeletsky
Created February 22, 2012 12:11
Show Gist options
  • Save alexbeletsky/1884547 to your computer and use it in GitHub Desktop.
Save alexbeletsky/1884547 to your computer and use it in GitHub Desktop.
My git config
[user]
name = alexander.beletsky
email = alexander.beletsky@gmail.com
[alias]
lg = log --all --graph --pretty=format:'%C(bold blue)<%an>%Creset %Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%ci)%Creset' --abbrev-commit
[merge]
tool = p4merge
[diff]
tool = p4diff
guitool = p4diff
[core]
autocrlf = false
[http]
sslcainfo = d:/Program Files/Git/bin/curl-ca-bundle.crt
[mergetool "p4merge"]
cmd = \"p4merge.exe $BASE $LOCAL $REMOTE $MERGED\"
[difftool "p4diff"]
cmd = \"p4merge.exe $LOCAL $REMOTE\"
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment