[merge]
  tool = vimdiff
[user]
  name = Sam Bao
  email = sambao21@gmail.com
[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
[core]
  excludesfile = <%=node['sprout']['home']%>/.gitignore_global
  editor = subl -n -w

[merge]
  tool = vimdiff
[user]
  name = Sam Bao
  email = sambao21@gmail.com
[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
[core]
  excludesfile = <%=node['sprout']['home']%>/.gitignore_global
  editor = subl -n -w
[credential]
  helper = osxkeychain

Add osxkeychain credential helper to gitconfig
Add osxkeychain credential helper to gitconfig
