Skip to content

Instantly share code, notes, and snippets.

@donnib
Created August 3, 2015 12:08
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save donnib/5c09257f05e846183993 to your computer and use it in GitHub Desktop.
Save donnib/5c09257f05e846183993 to your computer and use it in GitHub Desktop.
difftool.sourcetree.cmd=/usr/local/bin/bcomp $LOCAL $REMOTE
difftool.sourcetree.path=
mergetool.sourcetree.cmd=/usr/local/bin/bcomp $LOCAL $REMOTE $BASE $MERGED
mergetool.sourcetree.trustexitcode=true
core.repositoryformatversion=0
core.filemode=true
core.bare=false
core.logallrefupdates=true
core.ignorecase=true
core.precomposeunicode=true
remote.origin.url=/Users/mihai/myRepoBare.git
remote.origin.fetch=+refs/heads/*:refs/remotes/origin/*
branch.master.remote=origin
branch.master.merge=refs/heads/master
branch.newFeature.remote=origin
branch.newFeature.merge=refs/heads/newFeature
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment