Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- [filter "lfs"]
- clean = git-lfs clean %f
- smudge = git-lfs smudge %f
- required = true
- [user]
- name =
- email =
- [core]
- autocrlf = true
- excludesfile = C:\\Users\\cbjugstad.INTEL\\Documents\\gitignore_global.txt
- [merge]
- tool = p4merge
- [diff]
- tool = p4merge
- [difftool "p4merge"]
- cmd = 'C:/Program Files/Perforce/p4merge.exe' \"$LOCAL\" \"$REMOTE\"
- [mergetool "p4merge"]
- cmd = 'C:/Program Files/Perforce/p4merge.exe' \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"
- trustExitCode = true
- [difftool "sourcetree"]
- cmd = 'C:/Program Files/Perforce/p4merge.exe' \"$LOCAL\" \"$REMOTE\"
- [mergetool "sourcetree"]
- cmd = 'C:/Program Files/Perforce/p4merge.exe' \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"
- trustExitCode = true
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement