gitconfig

# Allow local customizations in the .gitconfig_local file
[include]
	path = ~/.gitconfig_local

[difftool "kompare"]
	external = kompare
	prompt = false
[difftool]
        external = meld
        prompt = false
[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
[color]
	ui = auto
	branch = auto
	diff = auto
	interactive = auto
[color "status"]
	added = green
	changed = yellow
	untracked = red
[core]
	excludesfile = ~/.gitexcludes
	autocrlf = input
[push]
	default = tracking
[alias]
        pullup = !"git fetch origin -v; git rebase origin/master;git fetch upstream -v; git rebase upstream/master"
	lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --
        branchclean = "!f() { git branch --merged ${1-master} | grep -v " ${1-master}$" | xargs -r git branch -d; }; f"
[url "http://paraview.org"]
	insteadOf = git://paraview.org
[url "http://public.kitware.com"]
	insteadOf = git://public.kitware.com
[url "http://vtk.org"]
	insteadOf = git://vtk.org
[branch]
	autosetupmerge = true
[log]
	follow = true
[user]
	name = Pete Peterson