Git aliases

.gitconfig

//add to ~/.gitconfig

[alias]
  cp = cherry-pick
  st = status -s
  ci = commit
  br = branch
  co = checkout
  df = diff --wrod-diff
  lg = log -pm
  sl = stash list
  sa = stash apply
  ss = stash save
  lg = log --graph --abbrev-commit --decorate --date=relative --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)'

  conflicts = !git ls-files --unmerged | cut -f2 | sort -u
  count-conflicts = !grep -c '^=======$'
  count-all-conflicts = !grep -c '^=======$' $(git conflicts)