gitconfig

[user]
        name = James R
        email = James.Rudd@sydneyboys-h.schools.nsw.edu.au

[apply]
  whitespace = strip

[color]
  diff = auto
  status = auto
  branch = auto

[alias]
  st      = status
  d       = diff
  a       = add
  ci      = commit
  cia     = commit -a
  co      = checkout
  cob     = checkout -b
  br      = branch
  lg      = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset' --abbrev-commit --date=relative
  l1     = log --pretty=oneline --abbrev-commit --decorate
  lp      = log -p
  lol = log --graph --decorate --pretty=oneline --abbrev-commit
  lola = log --graph --decorate --pretty=oneline --abbrev-commit --all
  ls = ls-files
  who     = shortlog -s --
	datetag = !git tag `date \"+%Y%m%d%H%M\"`

  edit-unmerged = "!f() { git ls-files --unmerged | cut -f2 | sort -u ; }; vim -p `f`"
  add-unmerged  = "!f() { git ls-files --unmerged | cut -f2 | sort -u ; }; git add `f`"

[github]
        token = 1ca4db8ded514fa370a2174e11043fe3
        user = James Rudd
		
[merge]
	tool = vimdiff