Source

dotfiles / gitconfig.rc

Full commit
[user]
	name = Ryan Wilcox
	email = rwilcox@wilcoxd.com
[core]
	excludesfile = /Users/aias/.gitignore_global
	filemode = false
[color]
	diff = auto
	status = auto
[alias]
	workyesterday = log --since='2 days ago'
	scrum = log --author="Ryan Wilcox" --format='%aD %s' --since="1 day ago"
	co = checkout
	ci = commit
	st = status
	br = branch
	hist = log --pretty=oneline --abbrev-commit --graph --decorate
	type = cat-file -t
	dump = cat-file -p
	statsu = status
	pu = push github master
	pl = pull github master
	ls = diff --numstat
[difftool "sourcetree"]
	cmd = opendiff \"$LOCAL\" \"$REMOTE\"
	path = 
[mergetool "sourcetree"]
	cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
	trustExitCode = true
[branch]
	autosetupmerge = true
[alias]
	pdiff = show
[push]
	default = current

[diff "xibition"]
    textconv = /Users/aias/Development/OutsideTools/xibition/xibition
    cachetextconv = true
    xfuncname = "^(@interface[ \t].*)$\n^[0-9 |-]*----\\+ (.+)$"

[diff "localizablestrings"]
	textconv = "iconv -f utf-16 -t utf-8"

# This section requires AT LEAST Git 1.7.10
# it will also silently ignore the file if it can't find it.
# See: <http://stackoverflow.com/a/9733277/224334>
[include]
  path = .gitconfig_private