A better git experience

my.bash_profile

# Load the default .profile
[[ -s "$HOME/.profile" ]] && source "$HOME/.profile"

# Load RVM into a shell session *as a function*
[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm"

if [ -f $(brew --prefix)/etc/bash_completion ]; then
    source $(brew --prefix)/etc/bash_completion
fi

parse_git_branch() {
    git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/ (\1)/'
}

source /usr/local/git/contrib/completion/git-completion.bash

GIT_PS1_SHOWDIRTYSTATE=true
export PS1="\u@\h \[\033[38;5;60m\]\w\[\033[38;5;215m\]\$(parse_git_branch)\[\033[00m\] $ "

my.gitconfig

[color "diff"]
    meta = 75
    frag = 62
    old = 167
    new = 71
[filter "lfs"]
    clean = git lfs clean %f
    smudge = git lfs smudge %f
    required = true
[alias]
    co = checkout
    br = branch
    ci = commit
    st = status
    ft = fetch
    type = cat-file -t
    dump = cat-file -p
    unstage = reset HEAD --
    last = log -1 HEAD
    lg = log --color --graph --date=short --pretty=format:'%Cred%h%Creset %Cgreen%ad %C(yellow)%d%Creset| %s %C(bold blue)[%an]%Creset' --abbrev-commit
[apply]
    whitespace = nowarn
[merge]
    tool = diffmerge
[mergetool "diffmerge"]
    cmd = diffmerge --merge --result=$MERGED $LOCAL $BASE $REMOTE
    trustExitCode = true
[mergetool]
    keepBackup = false