gistfile1.txt

[user]
	name = Geoff
	email = geoff@cloudkick.com
[color]
	diff = auto
	status = auto
	branch = auto
[core]
	editor = mate -w
[branch]
	autosetupmerge = true
[push]
  default = matching
[alias]
  st = status
  ci = commit
  br = branch
  co = checkout
  df = diff
  lg = log -p
  lol = log --graph --decorate --pretty=oneline --abbrev-commit
  lola = log --graph --decorate --pretty=oneline --abbrev-commit --all
  ls = ls-files