My Favourite Git Aliases

[alias]
  co = checkout
  st = status
  ci = commit
  br = branch
  df = diff
  cp = cherry-pick
  staged = diff --cached
  unstaged = diff
  both = diff HEAD
  oneline = log --pretty=online
  amend = commit --amend
  lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset' --abbrev-commit --date=relative
  lol = log --graph --decorate --pretty=oneline --abbrev-commit
  lola = log --graph --decorate --pretty=oneline --abbrev-commit --all
  ls = ls-files
  # put = push origin HEAD
  # track = !git-track
  # thanks = !git-thanks
  # workdir = !git-new-workdir
  # up = !git pull --rebase && git push
  # ignored = "!git ls-files --others --exclude-standard"
  # nb = checkout -b
  # pending = !git --no-pager log origin/master..master && echo
  # db = !sh -c 'git branch -D "$0" && git push origin ":$0"' &> /dev/null
  # missing = !sh -c 'git cherry "$0" | cut -sd + -f 2 | xargs "git show"'
  # lc = log ORIG_HEAD.. --stat --no-merges
  # conflicts = !git ls-files --unmerged | cut -c51- | sort -u | xargs $EDITOR
  # resolve = !git ls-files --unmerged | cut -c51- | sort -u | xargs git add
  # subadd = !sh -c 'git submodule add $(git config -f"$0".git/config remote.origin.url) "$0"'

[color]

  diff = auto
  status = auto
  branch = auto
  interactive = auto
  ui = auto

[color "branch"]

  current = green
  local = magenta
  remote = cyan

[color "diff"]

  whitespace = red reverse
  meta = yellow bold
  frag = magenta
  old = red
  new = green

[color "status"]

  added = green
  changed = yellow
  untracked = cyan

[format]

  numbered = auto

[push]

  default = tracking