Skip to content

Instantly share code, notes, and snippets.

@pwilkins
Created March 30, 2015 15:20
Show Gist options
  • Save pwilkins/595b5752a1f159666811 to your computer and use it in GitHub Desktop.
Save pwilkins/595b5752a1f159666811 to your computer and use it in GitHub Desktop.
[user]
name = pwilkins
email = pwilkins@mit.edu
[color]
ui = true
[push]
default = simple
[core]
autocrlf = input
excludesfile = /Users/pwilkins/.gitignore_global
[credential]
helper = osxkeychain
[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
[gitflow "branch"]
master = release
develop = master
[gitflow "prefix"]
feature = feature/
release = rc/
hotfix = hotfix/
support = support/
versiontag = v
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment