.gitconfig @ 03e2fdbbdc59

[user]
name = Steve Losh
email = steve@stevelosh.com

[core]
pager = cat
editor = vim
	excludesfile = /Users/sjl/.gitignore

[alias]
gl  = log -10 --color=always --all --graph --topo-order --pretty='format: %Cgreen%h%Creset %s%Cred%d%Creset%n'
gll = log     --color=always --all --graph --topo-order --pretty='format: %Cgreen%h%Creset %s%Cred%d%Creset%n'

pull = pull --ff-only
merge = merge --no-ff

ci = commit
cm = commit -m

co = checkout

stat = status
st = status

unstage = reset HEAD
uns = reset HEAD

[color]
branch = auto
diff = auto
interactive = auto
status = auto

[difftool "Kaleidoscope"]
cmd = ksdiff-wrapper git \"$LOCAL\" \"$REMOTE\"

[difftool]
prompt = false

[diff]
tool = Kaleidoscope

[merge]
tool = threesome

[mergetool "threesome"]
cmd = "mvim -f $BASE $LOCAL $REMOTE $MERGED -c 'ThreesomeInit'"
trustExitCode = true