GIT configuration with some useful aliases

gitconfig

# Just drop this file in ~/.gitconfig

[user]
  name = Jose Alberto
  email = [email protected]
[giggle]
  main-window-view = HistoryView
  history-view-vpane-position = 501
  main-window-maximized = true
  main-window-geometry = 0x0+0+0
  file-view-vpane-position = 581
[core]
  excludesfile = /home/bass/.gitignore
  editor = vi -f
[color]
  diff = auto
  status = auto
  branch = auto
[alias]
  co = checkout
  cos = checkout staging
  com = checkout master
  ci = commit
  cia = commit -a
  smi = submodule init
  smu = submodule update
  sm = submodule
  st = status -sb
  br = branch
  lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset'
  sl = stash list --pretty=format:'%Cblue%h %Cred* %C(yellow)%s'
  df = diff --word-diff
  sl = stash list
  sa = stash apply
  ss = stash save
[push]
  default = current
[diff]
  tool = meld
[merge]
  tool = mymeld
  conflictstyle = diff3
[difftool]
  prompt = false
[mergetool "mymeld"]
  cmd = meld "$LOCAL" "$MERGED" "$REMOTE"
[help]
  autocorrect = 1