.gitconfig

[pack]
	threads = 0
[color]
	ui = auto
[apply]
	whitespace = nowarn
[alias]
	cp = cherry-pick
  	co = checkout
  	ci = commit
  	di = diff
  	st = status
  	br = branch
  	mg = merge
	lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset' --abbrev-commit --date=relative
[mirror]
  	summary = true
[apply]
  	whitespace = strip
[diff]
  	renamelimit = 0
	tool = kdiff3
[color]
  	branch = auto
  	diff = auto
  	status = auto
[gc]
    auto = 1
[merge]
	tool = deltawalker
	log = true
	prompt = false
[mergetool  "deltawalker"]
	cmd = "/Applications/DeltaWalker.app/Contents/MacOS/bzr-git-merge" "$LOCAL" "$REMOTE" "$BASE" "$MERGED"