.gitconfig

[alias]
    conflicts = diff --name-only --diff-filter=U

    #checkout
    co = checkout
    cob = checkout -b

    #log
    glog = log --decorate --graph --abbrev-commit
    plog = log --decorate --graph -p
    slog = log --decorate --graph --stat
    olog = log --decorate --graph --oneline

    #ignored
    ignored = ls-files -o -i --exclude-standard

[apply]
    whitespace = nowarn

[branch]
    autosetupmerge = true

[core]
    editor = vim
    excludesfile = ~/.gitignore
    whitespace=fix,-indent-with-non-tab,trailing-space,cr-at-eol

[color]
    ui = true

[color "branch"]
    current = yellow reverse
    local = yellow
    remote = green

[color "diff"]
    frag = magenta bold
    meta = yellow bold
    new = green bold
    old = red bold
    whitespace = red reverse

[color "status"]
    added = yellow bold
    changed = green bold
    untracked = cyan bold

[credential]
    helper = manager

[diff]
    algorithm = histogram
    compactionHeuristic = true
    indentHeuristic = true

[http]
    postBuffer = 524288000
    sslVerify = false

[push]
    default = simple

[user]
    email = me@me
    name = Me me

[commit]
    verbose = true

[rerere]
	enabled = true