.gitconfig

[alias]
    d = difftool
    st = status --short
    ci = commit
    co = checkout
    fa = fetch --all
    unpushed = !GIT_CURRENT_BRANCH=$(git rev-parse --symbolic-full-name --abbrev-ref HEAD) && git log origin/$GIT_CURRENT_BRANCH..HEAD --name-status
    incoming = !GIT_CURRENT_BRANCH=$(git rev-parse --symbolic-full-name --abbrev-ref HEAD) && git log ..origin/$GIT_CURRENT_BRANCH --name-status
    mergecurrent = !GIT_CURRENT_BRANCH=$(git rev-parse --symbolic-full-name --abbrev-ref HEAD) && git merge origin/$GIT_CURRENT_BRANCH
    diffwith = !GIT_CURRENT_BRANCH=$(git rev-parse --symbolic-full-name --abbrev-ref HEAD) && git show-branch --sha1-name $GIT_CURRENT_BRANCH 
    diffwithmaster = log master..HEAD --no-merges --oneline --decorate --date=relative --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' 
    diffwithdevel = log devel..HEAD --no-merges --oneline --decorate --date=relative --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' 
    lg1 = log --graph --abbrev-commit --decorate --date=relative --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' --all
    lg2 = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset)%C(bold yellow)%d%C(reset)%n''          %C(white)%s%C(reset) %C(dim white)- %an%C(reset)' --all
    showtool = "!sh -c 'if [ -z $1 ]; then REVISION=HEAD; else REVISION=$1; fi; shift; git difftool $REVISION~ $REVISION $@' -"
    unadd = reset HEAD
[color]
    ui = auto
[push]
    default = simple
[merge]
    tool = diffconflicts
[diff]
    tool = gvimdiff
[difftool]
    prompt = false
[core]
    editor = vim
[mergetool "diffconflicts"]
    cmd = diffconflicts vim $BASE $LOCAL $REMOTE $MERGED
    trustExitCode = true
    keepBackup = false
[mergetool]
    keepBackup = false