Guest User

Untitled

a guest
May 24th, 2018
215
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 1.00 KB | None | 0 0
  1. [user]
  2. name = Jamie da Silva
  3. email = jdasilva@silverlakesoftware.com
  4. [core]
  5. autocrlf = true
  6. editor = code --wait --new-window
  7. [diff]
  8. tool = bc3
  9. [merge]
  10. tool = bc3
  11. [difftool "bc3"]
  12. path = c:/Program Files/Beyond Compare 4/bcomp.exe
  13. [mergetool "bc3"]
  14. path = c:/Program Files/Beyond Compare 4/bcomp.exe
  15. [difftool "sourcetree"]
  16. cmd = 'C:/Program Files/Beyond Compare 4/BComp.exe' \"$LOCAL\" \"$REMOTE\"
  17. [mergetool "sourcetree"]
  18. cmd = 'C:/Program Files/Beyond Compare 4/BComp.exe' \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\"
  19. trustExitCode = true
  20. [difftool "bcdir"]
  21. cmd = 'c:/Program Files/Beyond Compare 4/bcomp.exe' \"$LOCAL\" \"$REMOTE\" -expandall
  22. [alias]
  23. diffall = difftool --dir-diff --tool=bcdir --no-prompt
  24. p4 = !python 'C:/Program Files/Git/mingw64/libexec/git-core/git-p4'
  25. p4s = !python 'E:/git-p4s.py'
  26. reparent = !e:/git-reparent.sh
  27. [format]
  28. pretty = oneline
  29. [log]
  30. abbrevCommit = true
  31. [mergetool]
  32. keepBackup = false
  33. [push]
  34. default = current
Add Comment
Please, Sign In to add comment