.gitconfig

[alias]
    co = checkout
    ci = commit -a
    br = branch
    me = merge --no-ff
    undo = reset --hard ORIG_HEAD
    st = status
    stat = status
    up = pull --rebase
    unstage = reset HEAD --
    lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
    puff = pull --ff-only
    assume   = update-index --assume-unchanged
    unassume = update-index --no-assume-unchanged
    assumed  = "!git ls-files -v | grep ^h | cut -c 3-"
    snap     = !git stash save "snapshot: $(date -u +'%Y-%m-%dT%H:%M:%SZ')" && git stash apply "stash@{0}"
    ours     = "!f() { git checkout --ours $@ && git add $@; }; f"
    theirs   = "!f() { git checkout --theirs $@ && git add $@; }; f"
    hist = log --pretty=format:'%h %ad | %s%d [%an]' --graph --date=short
    type = cat-file -t
    dump = cat-file -p
    aa   = add --all --intent-to-add
    ap   = add --patch
    aw   = !sh -c 'git diff -w --no-color "$@" | git apply --cached --ignore-whitespace' -
    hammer   = "!f() { git reset --hard && git clean -dxf; }; if [[ -d '.git' ]]; then f; fi"


[apply]
    whitespace = warn

[color]
    diff = auto
    status = auto

[receive]
    denyCurrentBranch = warn

[core]
    autocrlf = input
    pager = less -F -X

[branch]
     autosetuprebase = always

[push]
    default = simple

[diff]
    algorithm = patience

[mergetool]
    keepBackup = true