My gitconfig

gistfile1.txt

[user]
	name = Americo Savinon
	email = americos@gmail.com
[color]
	diff = auto
	status = auto
	branch = auto
[alias]
	visual = gitk
[core]
	editor = subl -w
	excludesfile = /Users/americosavinon/.gitignore_global
[alias]
	co = checkout
	a = add
	st = status
	d = diff
	ds = diff --staged
	ci = commit
	br = branch
	hist = log --pretty=format:\"%h %ad | %s%d [%an]\" --graph --date=short
	type = cat-file -t
	dump = cat-file -p
	pretty = log --pretty=oneline
	g = log --graph --pretty=oneline --all --abbrev-commit --decorate
	f  = show --pretty="format:" --name-only
	undo = reset --soft HEAD^
	standup = log --since '1 day ago' --oneline --author americos@gmail.com
	lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
[merge]
    summary = true
    keepbackup = false;
    tool = "p4merge" 
[mergetool "p4merge"]
    cmd = p4merge "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
	keepTemporaries = false
	trustExitCode = false
	keepBackup = false
[diff]
	external = p4diff
[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
[heroku]
	account = americo
[credential]
	helper = osxkeychain
[push]
	default = matching