gitconfig

[user]
        name = Mark Schmidt
[color]
        status = auto
        diff = auto
        branch = auto
[diff]
        tool = kdiff3
[merge]
        tool = opendiff
        tool = mate
[rebase]
        autoStash = true
[core]
        excludesfile = ~/.gitignore
        editor = vim
[push]
        default = upstream
[apply]
        whitespace = nowarn
[alias]
        ci = commit
        co = checkout
        st = status
        di = diff
        dc = diff --cached
        amend = commit --amend
        aa = add --all
        br = branch
        cp = cherry-pick
        sm = submodule
        lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset %Cred[%an]%Cred' --abbrev-commit --date=relative
        up = !sh -c 'git pull --rebase --prune && git log --pretty=format:\"%Cred%ae %Creset- %C(yellow)%s %Creset(%ar)\" HEAD@{1}..'
        ll = log ORIG_HEAD..HEAD --pretty=oneline
        my = log --author=mark.schmidt
        su = submodule update
        latest = for-each-ref --count=10 --sort=-committerdate --format='%(committerdate:relative) %(refname:short)'
        diff-no-renames = diff --diff-filter=M
        listtags = for-each-ref --format='%(if)%(committerdate)%(then)%(committerdate)%(else)%(*committerdate)%(end) %(refname:lstrip=2)' refs/tags/*

[include]
        path = ~/.gitconfig.local
[pull]
	ff = only
[rerere]
	enabled = true