My ~/.gitconfig setup

.gitconfig

#
# [url "https://"]
#	insteadOf = git://
#

[user]
	name = Carlos Santana
	email = {username@gmail.com}
[color]
	ui = auto
[core]
	editor = vim
	excludesfile = /Users/{username}/.gitignore_global
	pager = less -F -X
[merge]
	tool = p4mergetool
[mergetool "p4mergetool"]
	cmd = /Applications/p4merge.app/Contents/Resources/launchp4merge $PWD/$BASE $PWD/$REMOTE $PWD/$LOCAL
	trustExitCode = false
[mergetool]
	keepBackup = false
[diff]
	tool = p4mergetool
[difftool "p4mergetool"]
	cmd = /Applications/p4merge.app/Contents/Resources/launchp4merge $LOCAL $REMOTE
[alias]
	lol = log --oneline --graph --decorate --all
	s = status
	c = commit -a -m 
	lol2 = log --graph --all --pretty=format:'%C(yellow)%h%Creset -%C(blue)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
[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
[push]
	default = simple