code.delx.au - dotfiles/blob - .gitconfig

   1 [user]
   2     name = James Bunton
   3     email = jamesbunton@delx.net.au
   4 [color]
   5     ui = auto
   6 [core]
   7     pager = less -+F -+X
   8     editor = vim
   9 [log]
  10     decorate = full
  11 [diff]
  12     renamelimit = 10000
  13     renames=copies
  14 [push]
  15     # Set to tracking instead of upstream for backwards compatibility
  16     default = tracking
  17 [alias]
  18     graphlog = log --graph --pretty=format:'%C(bold black)%h%Creset %C(bold red)%ad %C(bold blue)%s%Creset %C(bold yellow)%d%Creset %C(bold black)<%an>%Creset' --date=short
  19     ci = commit
  20     co = checkout
  21     st = status
  22     di = diff
  23     diw = diff --color-words
  24     dic = diff --cached
  25     dicw = diff --cached --color-words
  26     ff = merge --ff-only
  27     ffpull = pull --ff-only
  28     lso = ls-files -X .gitignore -o
  29     pushn = !git push origin --set-upstream "$(git rev-parse --abbrev-ref HEAD)"
  30     pushd = !git push origin --delete "$(git rev-parse --abbrev-ref HEAD)"
  31     cherry-pick = cherry-pick -x
  32     branches-to-kill = !git branch --merged origin/master|grep -v master|xargs -n1 echo git branch -d
  33     mergediff = !git checkout --quiet --detach HEAD && git merge --no-edit origin/master && git diff -C10 -M10 origin/master && git checkout --quiet -