Advertisement
Guest User

Untitled

a guest
Jul 24th, 2017
561
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 1.17 KB | None | 0 0
  1. [user]
  2. name = mynanme
  3. email = myemail@email.com
  4. [credential]
  5. helper = wincred
  6. [push]
  7. default = simple
  8. [diff]
  9. tool = bc3
  10. [difftool]
  11. prompt = false
  12. [difftool "vsdiffmerge"]
  13. cmd = \"C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\Common7\\IDE\\vsdiffmerge.exe\" \"$LOCAL\" \"$REMOTE\" //t
  14. [difftool "vsdiffmerge"]
  15. keepbackup = false
  16. [merge]
  17. tool = bc3
  18. [mergetool]
  19. prompt = false
  20. keepBackup = false
  21. [mergetool "vsdiffmerge"]
  22. cmd = \"C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\Common7\\IDE\\vsdiffmerge.exe\" \"$REMOTE\" \"$LOCAL\" \"$BASE\" \"$MERGED\" //m
  23. trustexitcode = true
  24. [mergetool "vsdiffmerge"]
  25. keepbackup = false
  26. [core]
  27. autocrlf = true
  28. [difftool "bc3"]
  29. path = c:/Program Files/Beyond Compare 4/bcomp.exe
  30. [mergetool "bc3"]
  31. path = c:/Program Files/Beyond Compare 4/bcomp.exe
  32.  
  33. [alias]
  34. br = for-each-ref --sort=committerdate refs/heads/ --format='%(HEAD) %(color:yellow)%(refname:short)%(color:reset) - %(color:red)%(objectname:short)%(color:reset) - %(contents:subject) - %(authorname) (%(color:green)%(committerdate:relative)%(color:reset))'
  35. co = checkout
  36. st = status
  37. last = log -1 HEAD
  38. d = diff -w --color-words="[^[:space:]]|([[:alnum:]]|UTF_8_GUARD)+"
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement