Created
March 10, 2017 06:45
-
-
Save killertilapia/31aa530074050ed72428f6402214b486 to your computer and use it in GitHub Desktop.
Git config for with merge and diff tools (pycharm) configured
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
[core] | |
excludesfile = /Users/jaypax/.gitignore_global | |
[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 | |
[mergetool "pycharm"] | |
cmd = charm merge $(cd $(dirname "$LOCAL") && pwd)/$(basename "$LOCAL") $(cd $(dirname "$REMOTE") && pwd)/$(basename "$REMOTE") $(cd $(dirname "$B$ | |
trustExitCode = true | |
[diff] | |
tool = pycharm | |
[difftool "pycharm"] | |
cmd = charm diff $(cd $(dirname "$LOCAL") && pwd)/$(basename "$LOCAL") $(cd $(dirname "$REMOTE") && pwd)/$(basename "$REMOTE") | |
[user] | |
name = | |
email = | |
[commit] | |
template = /Users/jaypax/.stCommitMsg |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment