gitconfig

[user]
	name = Alex Silcock
[core]
	editor = vim
	excludesfile = ~/dotfiles/gitignore_global
[color]
	ui = true
[push]
	default = current
[alias]
	co = checkout
    # fuzzy checkout - checkout a branch containing the string (even if the branch only exists on the remote)
	c = "!f() { git branch -a | sed 's/remotes\\/origin\\///g' | grep -v 'HEAD' | grep $1 | sort | uniq | xargs git checkout; }; f"
	st = status
	f = fetch
	ff = merge --ff-only
	ffo = "!git merge --ff-only origin/$1"
	br = branch
	rc = rebase --continue
	dc = diff --cached
	rh = reset --hard @{u}
	#review = "!f() { git merge $1 --no-commit --no-ff; git diff --cached; }; f"

	recall = "!g() { ~/dotfiles/scripts/recall.sh $1 }; g"
[rerere]
	enabled = true
[merge]
	conflictStyle = diff3