My .gitconfig settings on OS X

.gitconfig-Mac

#
# My common settings for Mac
# Currently using Sublime editor, perforce p4merge

[user]
	name = Mike Stapp
	email = xxx@xxx

[core]
  editor = subl -n -w
  OLD_vim_editor = /Applications/MacVim.app/Contents/MacOS/Vim -g -f
  OLD_bbedit_editor = bbedit --wait --resume
  autocrlf = input
  
[merge]
  keepBackup = false;
  tool = custom
  conflictstyle = diff3
  
[mergetool "custom"]
  cmd = /Applications/Utilities/p4merge.app/Contents/MacOS/p4merge "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
  keepTemporaries = false
  trustExitCode = false
  keepBackup = false
  
[extdiff]
  external = p4diff