Skip to content

Instantly share code, notes, and snippets.

@yarmand
Created March 25, 2013 17:57
Show Gist options
  • Save yarmand/5239169 to your computer and use it in GitHub Desktop.
Save yarmand/5239169 to your computer and use it in GitHub Desktop.
my actual .gitconfig
[gui]
[diff]
tool = vim
[difftool "vim"]
cmd = "vimdiff \"$LOCAL\" \"$REMOTE\""
[merge]
[guitool "Files/Open"]
cmd = mvim $FILENAME
noconsole = yes
[user]
name = yann ARMAND
email = yarmand@yammer-inc.com
[merge]
diffstat = false
[core]
excludesfile = /Users/yarmand/.gitignore_global
[difftool "sourcetree"]
cmd = opendiff \"$LOCAL\" \"$REMOTE\"
path =
[mergetool "sourcetree"]
cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
trustExitCode = true
[alias]
latest = "! sh -c 'git fetch; git checkout -b temp ; git branch -D $1 ; git checkout $1 ; git branch -D temp' -"
co = "checkout"
ll = log --graph --max-count=20 --pretty=format:'%C(yellow)%h%Creset -%C(red)%d%Creset %s %C(green)(%an, %cr)%Creset'
l = log --graph --pretty=format:'%C(yellow)%H%Creset -%C(red)%d%Creset %s %C(green)(%an, %cr)%Creset %C(red)%N%Creset'
s = status --branch --short --untracked=no
ss = status
[color]
ui = auto
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment