Advertisement
Guest User

Untitled

a guest
Jul 22nd, 2019
89
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 2.16 KB | None | 0 0
  1. [user]
  2. name = xxxxxxxxxxxxxxx
  3. email = xxxxxxxxxx@xxxxxxx.xxxx
  4. [credential]
  5. helper = manager
  6. [core]
  7. editor = nano
  8. [color]
  9. # Enable colors in color-supporting terminals
  10. ui = auto
  11.  
  12. [filter "lfs"]
  13. clean = git-lfs clean -- %f
  14. smudge = git-lfs smudge -- %f
  15. process = git-lfs filter-process
  16. required = true
  17.  
  18. [diff]
  19. tool = vsdiffmerge
  20. guitool = winmerge
  21.  
  22. [difftool]
  23. prompt = false
  24.  
  25. [difftool "winmerge"]
  26. path = C:/Program Files/WinMerge/winmergeu.exe
  27. cmd = \"C:/Program Files/WinMerge/winmergeu.exe\" -e -u -dl \"Local: $LOCAL\" -dr \"Remote: $REMOTE\" \"$LOCAL\" \"$REMOTE\"
  28.  
  29. [difftool "wm"]
  30. cmd = winmerge.sh \"$LOCAL\" \"$REMOTE\"
  31.  
  32. [difftool "vsdiffmerge"]
  33. cmd = \"C:/Program Files (x86)/Microsoft Visual Studio/2017/Professional/Common7/IDE/CommonExtensions/Microsoft/TeamFoundation/Team Explorer/vsDiffMerge.exe\" \"$LOCAL\" \"$REMOTE\" //t
  34. keepbackup = false
  35. trustexistcode = true
  36.  
  37. [merge]
  38. tool = vsdiffmerge
  39.  
  40. [mergetool]
  41. prompt = false
  42.  
  43. [mergetool "winmerge"]
  44. path = C:/Program Files/WinMerge/winmergeu.exe
  45. cmd = \"C:/Program Files/WinMerge/winmergeu.exe\" -e -u -wl -wr -fm -dl \"Mine: $LOCAL\" -dm \"Merged: $BASE\" -dr \"Theirs: $REMOTE\" \"$LOCAL\" \"$BASE\" \"$REMOTE\" -o \"$MERGED\"
  46. keepbackup = false
  47. trustexistcode = true
  48.  
  49. [mergetool "vsdiffmerge"]
  50. cmd = \"C:/Program Files (x86)/Microsoft Visual Studio/2017/Professional/Common7/IDE/CommonExtensions/Microsoft/TeamFoundation/Team Explorer/vsDiffMerge.exe\" \"$REMOTE\" \"$LOCAL\" \"$BASE\" \"$MERGED\" //m
  51. keepbackup = false
  52. trustexistcode = true
  53.  
  54. [pull]
  55. rebase = false
  56.  
  57. [fetch]
  58. prune = false
  59.  
  60. [rebase]
  61. autoStash = false
  62.  
  63. [alias]
  64. lm = log --color --author=lech-jedrzej.wiecierzynski@sms-group.com --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset'
  65. lg = log --color --oneline --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset'
  66. wd = difftool --tool=winmerge
  67. wm = mergetool --tool=winmerge
  68. dn = diff --name-status
  69. gr = log --color --graph --oneline --decorate=short --branches='*'
  70. gl = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement