.gitconfig

[user]
    email = maximk@il.ibm.com
    name = Maxim Kalaev
[core]
    whitespace=fix,-indent-with-non-tab,trailing-space,cr-at-eol
    editor = vim
[branch]
    autosetupmerge = true
    autosetuprebase = always
[push]
    default = tracking
[rebase]
    stat = True

# Merging stuff
[merge]
    #tool = vimdiff3
    tool = p4merge
[mergetool "p4merge"]
    cmd = p4merge "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
    keepTemporaries = false
    trustExitCode = false
    keepBackup = false
[mergetool "vimdiff3"]
    cmd = vim -f -d -c \"wincmd J\" \"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\"
[mergetool "gvimdiff3"]
    cmd = gvim -f -d -c \"wincmd J\" \"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\"
[difftool]
    prompt = false
[diff]
    tool = vimdiff

[color "branch"]
    current = yellow bold
    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
[color]
    ui = true
    diff = auto
[color "diff"]
    whitespace = red reverse

[alias]
    st = status
    ci = commit
    br = branch
    co = checkout
    df = diff
    lp = log -p
    lg = log --graph --decorate --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
    lol = log --graph --decorate --pretty=oneline --abbrev-commit
    lola = log --graph --decorate --pretty=oneline --abbrev-commit --all

    # Shows all commits that are in any of local branches but not in any of remote-tracking branches
    local = log --branches --not --remotes

    ls = ls-files
    what = whatchanged
    wdiff = diff --color-words
    showtool = "!showci () { rev=${1:-HEAD}; git difftool --trust-exit-code $rev~1 $rev; }; showci $1"

[rerere]
    enabled = 1