.gitconfig

[user]
	name = James Newell
	email = james.newell@gmail.com
[core]
	excludesfile = /Users/james/.gitignore_global
	editor = "subl -n -w"
[alias]
	graph = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
	lg = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --numstat
	unpushed = log --branches --not --remotes --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
	rollback = reset --hard HEAD~1
	unstage = reset HEAD
	undo = checkout --
	undo-all = reset --hard HEAD
	untracked-rm = clean -f -d
	last = log -1 HEAD
	ours = "!f() { git checkout --ours $@ && git add $@; }; f"
	theirs = "!f() { git checkout --theirs $@ && git add $@; }; f"
[color]
	ui = true
[push]
	default = simple
[diff]
	tool = bc3
[merge]
	tool = bc3
[difftool]
	prompt = false
[mergetool]
	prompt = false

.gitconfig-windows

[user]
	name = James Newell
	email = james.newell@gmail.com
[color]
	ui = true
[alias]
	graph = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
	lg = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --numstat
	unpushed = log --branches --not --remotes --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
	rollback = reset --hard HEAD~1
	unstage = reset HEAD
	undo = checkout --
	undo-all = reset --hard HEAD
	untracked-rm = clean -f -d
	last = log -1 HEAD
	ours = "!f() { git checkout --ours $@ && git add $@; }; f"
	theirs = "!f() { git checkout --theirs $@ && git add $@; }; f"
[core]
	autocrlf = false
	excludesfile = C:\\Users\\James\\.gitignore_global
	editor = "subl -n -w"
[push]
	default = simple
[diff]
	tool = bc3
[merge]
	tool = bc3
[difftool]
	prompt = false
[mergetool]
	prompt = false

.gitignore_global

*~
.DS_Store