Git conf

.gitconfig

[color]
    ui = auto
[push]
    default = upstream
[core]
    pager = cat
    editor = subl -n -w
    whitespace = -trailing-space
    excludesfile = ~/.gitignore_global
    autocrlf = input
[alias]
    wdiff = diff --word-diff
    st = status -sb
    co = checkout
    ci = commit
    oops = commit --amend -C HEAD
    unstage = reset HEAD --
    undo = reset --soft HEAD^1
    trash = reset --hard
    fp = format-patch
    lg = log --graph --pretty=tformat:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%an %cr)%Creset' --abbrev-commit --date=relative
    standup = "!sh -c 'git log --since \"1 day ago\" --oneline --author=\"$(git config user.email)\"'"
    latest = for-each-ref --sort=-committerdate --format='%(committerdate:short) %(refname:short) [%(committername)]'
    last = log -1
    upstream = rev-parse --abbrev-ref --symbolic-full-name @{u}
    pick = cherry-pick
[credential]
    helper = osxkeychain
[status]
    submoduleSummary = true
    showUntrackedFiles = all
[fetch]
    recurseSubmodules = on-demand
[grep]
    extendedRegexp = true
[log]
    abbrevCommit = true
[push]
    default = upstream
[color "branch"]
    upstream = cyan
[tag]
    sort = version:refname
[rerere]
    autoupdate = true
    enabled = true
[diff]
    tool = kdiff3
    mnemonicPrefix = true
    renames = true
    wordRegex = .
[merge]
    conflictStyle = diff3
    tool = kdiff3
[mergetool]
    keepBackup = false
    keepTemporaries = false
    prompt = false
[pull]
    rebase = true

.gitignore_global

.DS_Store
.idea
.vagrant
composer.phar
phpcbf.phar
phpcs.phar
.sass-cache/