gitconfig

[user]
	name = James Murty
	email = james@murty.co
[core]
  autocrlf = input
  safecrlf = true
  excludesfile = ~/.gitignore-global
  quotepath = false
[color]
  diff = auto
  status = auto
  branch = auto
  ui = true
[help]
  autocorrect = 1
[status]
  submodule = 1
[push]
  # Only push branches that have been set up to track a remote branch,
  # and push them directly to the upstream tracked branch.
  default = upstream
	followTags = true
[apply]
  whitespace = warn
[alias]
# Config recommendations from PeepCode's Advanced Git
  co = checkout
  # Log display from screencast, with train tracks.
  l = log --graph --pretty=format':%C(yellow)%h%Cblue%d%Creset %s %C(white) %an, %ar%Creset'
  # Alternate log display from Scott Chacon
  lol = log --pretty=oneline --abbrev-commit --graph --decorate
  # Other useful aliases:
  unstage = reset HEAD
  staged = diff --cached
  unstaged = diff
  current-branch = !git symbolic-ref -q HEAD | sed -e 's|^refs/heads/||'
  # Usage: git track origin/feature-123-login-form
  track = checkout -t
  # From https://thoughtbot.com/blog/dumpster-diving-through-dotfiles-git-branches
  branches = for-each-ref --sort=-committerdate --format=\"%(color:blue)%(authordate:relative)%09%(color:red)%(authorname)%09%(color:white)%(color:bold)%(refname:short)\" refs/remotes
[filter "lfs"]
	clean = git-lfs clean -- %f
	smudge = git-lfs smudge -- %f
	required = true
	process = git-lfs filter-process
[mergetool]
	keepBackup = true
[merge]
	ff = false
	log = true
[pull]
	ff = true