.gitconfig

[user]
	email = d.isaev@corp.mail.ru
	name = Denis Isaev
[core]
	autocrlf = false
    safecrlf = false
    whitespace=fix,-indent-with-non-tab,trailing-space,cr-at-eol
    pager=more
    editor=vim

[alias]
    st = status --short
    ci = commit
    br = branch
    co = checkout
    df = diff
    lg = log -p
    delete = rm
    revert = checkout --  
    hist = log --pretty=format:\"%h %ad | %s%d [%an]\" --graph --date=short
    type = cat-file -t
    dump = cat-file -p
    conflicts = !git ls-files --unmerged | cut -f2 | sort -u | xargs grep -El '<<<<<<<|=======|>>>>>>>'
    unmerged = !git ls-files --unmerged | cut -f2 | sort -u

[color]
    diff = true
    grep = true
    status = true
    ui = true

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

    [color "diff"]
        meta = normal
        frag = magenta bold
        old = red bold
        new = blue bold
        whitespace = red reverse

    [color "status"]
        added = yellow
        changed = green
        untracked = cyan
[diff]
    renames = copy
[merge]
	conflictstyle = diff3