gitconfig

gistfile1.txt

[diff]
    tool = vimdiff
[difftool "mvim"]
    cmd = mvim -d $LOCAL $REMOTE
    keepbackup = false
[alias]
    dt = difftool
    st = status
    cm = commit
    br = branch
    df = diff
    lg = log
    pl = pull
    ps = push
    co = checkout
    mt = mergetool
    cp = cherry-pick
    lol = log --graph --decorate --pretty=oneline --abbrev-commit
    lola = log --graph --decorate --pretty=oneline --abbrev-commit --all
    bi = bisect
[user]
    name = Kurt
    email = kespindler@gmail.com
[merge]
    tool = mvim
[mergetool "mvim"]
    cmd=/Users/local/bin/mvim -d -g $LOCAL $MERGED $REMOTE
    keepbackup=false