.gitconfig @ 46338ddc962a

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

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

[alias]
    l   = log -16 --color=always --all --topo-order --pretty='format:%Cgreen%h%Creset %s%Cred%d%Creset %C(black bold)(by %an)%Creset'
    ll  = log     --color=always --all --topo-order --pretty='format:%Cgreen%h%Creset %s%Cred%d%Creset %C(black bold)(by %an)%Creset'
    gl  = log -16 --color=always --all --graph --topo-order --pretty='format:%Cgreen%h%Creset %s %C(black bold)(by %an)%Creset%C(yellow bold)%d%Creset%n'
    gll = log     --color=always --all --graph --topo-order --pretty='format:%Cgreen%h%Creset %s %C(black bold)(by %an)%Creset%C(yellow bold)%d%Creset%n'

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

    ci = commit
    cm = commit -m

    d = diff
    di = diff --cached

    co = checkout
    id = rev-parse

    stat = status
    st = status

    unstage = reset HEAD
    uns = reset HEAD

    currentbranch = !git branch --contains HEAD | grep '*' | tr -s ' ' | cut -d ' ' -f2
    fo = fetch origin
    fu = fetch upstream
    po = push origin
    lo = pull origin
    mo = !git merge --no-ff origin/`git currentbranch`
    uo = !git merge --ff-only origin/`git currentbranch`

    addremove = !git add . && git add -u
    addrem = !git addremove

[push]
    default = current

[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
[web]
    browser = open