gitconfig

[user]
	name = Rob Miller
	email = rob@bigfish.co.uk
[core]
	excludesfile = ~/.gitignore
	quotepath = false
	pager = less -x4

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

[color "branch"]
	  current = yellow reverse
	  local = yellow
	  remote = green

[color "diff"]
	  meta = yellow
	  frag = magenta
	  old = red
	  new = green

[color "status"]
	  added = yellow
	  changed = green
	  untracked = cyan

[alias]
	st = status -sb
	ci = commit
	br = branch
	co = checkout
	df = diff --color-words
	dc = diff --cached
	lp = log -p --abbrev-commit --color-words
	lol = log --graph --decorate --pretty=oneline --abbrev-commit
	lola = log --graph --decorate --pretty=oneline --abbrev-commit --all
	ls = log --stat --abbrev-commit
	l = log --oneline --abbrev-commit
	lg = log --abbrev-commit --decorate
	ds = diff --stat

	code-review = difftool origin/master...
	log-merges = log --abbrev-commit --decorate --merges --first-parent
	unstage = reset HEAD

	assume = update-index --assume-unchanged
	unassume = update-index --no-assume-unchanged
	assumed = "!git ls-files -v | grep ^h | cut -c 3-"

	ours = "!f() { git co --ours $@ && git add $@; }; f"
	theirs = "!f() { git co --theirs $@ && git add $@; }; f"

	dl = "!git lg -p -1"
	diffc = diff --cached

	oldest-ancestor = !zsh -c 'diff -u <(git rev-list --first-parent "${1:-master}") <(git rev-list --first-parent "${2:-HEAD}") | sed -ne \"s/^ //p\" | head -1' -

	pusha = push --all

	# Show files ignored by git:
	ign = ls-files -o -i --exclude-standard
	switch = !legit switch \"$@\"
	branches = !legit branches
	sprout = !legit sprout \"$@\"
	unpublish = !legit unpublish \"$@\"
	harvest = !legit harvest \"$@\"
	sync = !legit sync \"$@\"
	publish = !legit publish \"$@\"
	graft = !legit graft \"$@\"
	conflicts = !git ls-files -u | cut -f 2 | sort -u

[branch]
	autosetupmerge = true
	autosetuprebase = always

[push]
	default = tracking

[diff]
	tool = Kaleidoscope

[merge]
	conflictstyle = diff3
	summary = true
	tool = Kaleidoscope

[mergetool]
	keepBackup = true
	prompt = false
[difftool "Kaleidoscope"]
	cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
[difftool]
	prompt = false
[mergetool "Kaleidoscope"]
	cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot