Personal Git Config

.gitconfig

[alias]
    dl = diff HEAD^1 
    dsl = diff HEAD^1 --stat
    pep8-last = !git diff HEAD^1 | flake8 --diff
    ru = remote update
    plog = log --pretty=\"format:%Cgreen %h %Creset| %Cblue%G?%Creset | %ar | %aN | %Cblue%s\"
    delete-merged = !git branch --merged | grep -v '^* master$' | grep -v '^  master$' | xargs git branch -d

[diff]
        tool = bc3
[difftool]
        prompt = false
[difftool "bc3"]
        cmd=/usr/bin/bcompare $LOCAL $REMOTE

[merge]
        tool = bc3
[mergetool]
        prompt = false
        keepBackup = false
[mergetool "bc3"]
        cmd=/usr/bin/bcompare $LOCAL $REMOTE $BASE $MERGED
        trustExitCode = true
        keepBackup = false

[gui]
        historybrowser = gitg