~/.gitconfig

.gitconfig

[user]
    email = leifer@gmail.com
    name = Leif Gruenwoldt
[gui]
    gcwarning = false
    maxfilesdisplayed = 1000
[color]
    ui = auto
[diff]
    tool=meld
[merge]
    #ff = only
    tool = meld
[rebase]
    stat = true
[alias]
    rank = shortlog -sn --no-merges
    staged = diff --cached
    uncommit = reset --soft HEAD^
    unstage = reset
[push]
    # Only push the current branch
    default = upstream

[branch "master"]
    # Always pull --rebase
    rebase = true
[branch]
    autosetuprebase = always