My git settings

.bashrc

#append this to your .bashrc file in your home
#git auto-completion
source ~/.git-completion.sh

#git prompt
source ~/.git-prompt.sh
GIT_PS1_SHOWCOLORHINTS=true
GIT_PS1_SHOWSTASHSTATE=true
GIT_PS1_SHOWUNTRACKEDFILES=true
GIT_PS1_SHOWUPSTREAM="auto"
GIT_PS1_SHOWCOLORHINTS=true

PROMPT_COMMAND='__git_ps1 "\u@\h:\w" "\\\$ "'

.gitconfig

#settings for .gitconfig

[user]
        name = your_name
        email = [email protected]
[push]
        default = matching
[giggle]
        main-window-maximized = false
        main-window-geometry = 1442x680+0+54
        main-window-view = FileView

[core]
        editor = nano
[merge]
        tool = vimdiff
[color]
        branch = auto
        diff = always
        interactive = auto
        status = auto
        pager = false
        ui = auto
        ui = true
[alias]
        lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative

[color "diff"]
        meta = yellow bold
        frag = magenta bold
        old = red bold
        new = green bold