Git Config

.gitconfig

[alias]
  co = checkout
  ci = commit
  ca = commit --amend
  cia = commit -a
  can = commit --amend --no-edit
  com = checkout master
  st = status
  s = status -s
  b = branch
  ba = branch -a
  br = branch
  hist = log --pretty=format:\"%h %ad | %s%d [%an]\" --graph --date=short
  hard = reset --hard origin/master
  type = cat-file -t
  dump = cat-file -p
  d = diff
  di = diff
  df = diff
  dc = diff --cached
  conflicts = diff --name-only --diff-filter=U
  lg = log -p
  lol = log --graph --decorate --pretty=oneline --abbrev-commit
  lola = log --graph --decorate --pretty=oneline --abbrev-commit --all
  ll = log --pretty=format:'%C(yellow)%h%Creset %C(green)%cd%Creset%x09%C(yellow)%d%Creset %s [%C(red)%an%Creset]' --graph --date=relative --decorate
  ls = ls-files
  ign = ls-files -o -i --exclude-standard
  sf = show --decorate --pretty=short --name-only
  ss = show --stat
  sc = log --max-count=1 --pretty=fuller --decorate
  puhs = push
  pus = push
  pu = push
  p = pull
  pul = pull
  pr = pull --rebase
  fo = fetch origin
  fp = fetch -p
  merge-theirs = merge -s recursive -X theirs --no-ff
  ls-subtrees = !"git log | grep git-subtree-dir | awk '{ print $2 }'"
[push]
    default = current

Includes aliases from:

• jrabbe/environment-settings,
• https://gist.github.com/ryanve/06fd45e2b65852003db6
  and more