My custom git shortcuts and merge tool settings.

.gitconfig

[alias]
	co = checkout
	cob = checkout -b
	cm = !git add -A && git commit -m	
	b = branch
	pu = push -u origin HEAD
	st = status
[merge]
	tool = p4merge
[mergetool "p4merge"]
	path = C:/Program Files/Perforce/p4merge.exe
	cmd = 'C:/Program Files/Perforce/p4merge.exe' $BASE $LOCAL $REMOTE $MERGED
[diff]
	tool = p4merge
[difftool "p4merge"]
	path = C:/Program Files/Perforce/p4merge.exe