Git files

.bashrc

PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\w$(__git_ps1 "\[\033[0;31m\](%s)")\[\033[00m\]\$ '

alias branch='git br | grep "*" | sed "s/\* //"'
alias gc='git commit -v'
alias gs='git status'
alias gp='git push origin `branch`'
alias gl='git pull origin `branch`'
alias grl='git pull --rebase origin `branch`'
alias ga='git add'
alias gb='git branch'
alias gm='git co master'
alias gd='git co -b'
alias gr='git rebase'
alias gitwork='gl && git co -b work'
alias gitsync='git co master && gl && git rebase master work'  
alias gitpush='gitsync && git co master && git merge work && gp && git branch -d work'
alias gitmerge='gitpush && git co -b work'

.gitconfig

[color]
  branch = auto
  diff = auto
  status = auto
[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 = cyan
[branch]
autosetupmerge = true
[alias]
  ci = commit
  st = status
  br = branch
  co = checkout
  df = diff
  lg = log -p
  who = shortlog -s --

[apply]
        whitespace = nowarn