Last active
November 10, 2019 22:21
-
-
Save chhh/c226cd37725ee6deb7a0 to your computer and use it in GitHub Desktop.
global git config for use with p4merge as difftool (does not create temp files [LOCAL REMOTE BRANCH etc.] or .orig files)
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
[credential] | |
helper = manager | |
# This is Git's per-user configuration file. | |
[user] | |
# Please adapt and uncomment the following lines: | |
name = <your name> | |
email = <your@email> | |
[color] | |
ui = true | |
interactive = auto | |
[include] | |
path = .gitaliases | |
path = .gitmorealiases | |
# [merge] | |
# tool = extMerge | |
# [mergetool "p4merge"] | |
# cmd = p4merge.exe $PWD/$BASE $PWD/$LOCAL $PWD/$REMOTE $PWD/$MERGED | |
# trustExitCode = false | |
# keepBackup = false | |
# [mergetool "extMerge"] | |
# cmd = extMerge $PWD/$BASE $PWD/$LOCAL $PWD/$REMOTE $PWD/$MERGED | |
# trustExitCode = false | |
# keepBackup = false | |
# [diff] | |
# external = extDiff | |
[merge] | |
tool = p4merge | |
[mergetool "p4merge"] | |
path = p4merge.exe | |
[diff] | |
tool = p4merge | |
[difftool "p4merge"] | |
path = p4merge.exe | |
[core] | |
autocrlf = false | |
excludesfile = ~/.gitignore_global | |
[credential] | |
helper = manager | |
[gui] | |
encoding = utf-8 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment