gistfile1.ini

[user]
    name = Nicolas Mendoza
    email = <email>
[branch]
    autosetuprebase = remote
[branch "master"]
    rebase = true
[merge]
    log = true
    summary = true
[rerere]
    enabled = true
[init]
    templatedir = ~/.gittemplate
[color]
    diff = auto
    status = auto
    branch = auto
[color "branch"]
    current = yellow reverse
    local = yellow
    remote = green
[color "diff"]
    meta = yellow bold
    frag = magenta bold
    old = red bold
    new = green bold
[color "status"]
    added = yellow
    changed = green
    untracked = cyan
[merge]
    tool = vimdiff
[alias]
    co = checkout
        ci = commit -v
    st = status
    sm = submodule
    br = branch -vv
    desc = describe
    hist = log --pretty=format:\"%C(yellow)%h %Cgreen%ad %Creset%s%C(yellow)%d %Creset[%C(cyan)%an%Creset]\" --graph --date=short
    ff = merge --ff-only @{u}
    track = !git branch --set-upstream $(git for-each-ref --format=\"%(refname:short)\" $(git symbolic-ref HEAD))
    delete-merged-branches = "!f() { git checkout --quiet master && git branch --merged | grep --invert-match '\\*' | xargs -n 1 git branch --delete; git checkout --quiet @{-1}; }; f"
[push]
        default = tracking

[merge "ours"]
    name = "Keep ours merge"
    driver = true