alias git

git_config

[user]
	email = edelans@gmail.com
	name = edelans
[merge]
	tool = meld
	conflictstyle = diff3

[alias]
        st = status
        up = !git pull --rebase --prune $@ && git submodule update --init --recursive
        pu = push
        co = checkout
        br = checkout -b
        ap = add -p
        cm = commit -m
        am = commit --amend
        fuck = !git stash && git reset --hard
        lg = log --graph --oneline --decorate --pretty=format:'%C(yellow)%h%Creset -%C(bold yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
        conf = config --global -e
        bclean = "!f() { git branch --merged ${1-master} | grep -v " ${1-master}$" | xargs -r git branch -d; }; f"
        bdone = "!f() { git checkout ${1-master} && git up && git bclean ${1-master}; }; f"

[color]
    ui = true

[color "branch"]
    current = yellow reverse
    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 = red

[core]
    editor = atom
    whitespace = trailing-space,space-before-tab

[apply]
    whitespace = fix

[rerere]
    enabled = 1
    autoupdate = 1

[push]
    default = simple