Guest User

Untitled

a guest
Nov 14th, 2018
112
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 1.37 KB | None | 0 0
  1. [user]
  2. name = Pavel Nezhencev
  3. email = pavel.nezhencev@creuna.com
  4. [core]
  5. autocrlf = true
  6. editor = code --wait
  7. [push]
  8. default = simple
  9. [alias]
  10. ll = log --graph --abbrev-commit --decorate --date=relative --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' --all
  11. lf = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset)%C(bold yellow)%d%C(reset)%n'' %C(white)%s%C(reset) %C(dim white)- %an%C(reset)' --all
  12. stash-rename = "!_() { rev=$(git rev-parse $1) && git stash drop $1 || exit 1 ; git stash store -m $2 $rev; }; _"
  13. sapply = "!f() { git stash apply stash^{/$*}; }; f"
  14. [diff "utf-16"]
  15. textconv = "iconv -f utf-16 -t utf-8"
  16.  
  17. #kdiff3
  18. [merge]
  19. tool = kdiff3
  20. [mergetool "kdiff3"]
  21. cmd = \"C:\\\\Program Files\\\\KDiff3\\\\kdiff3\" $BASE $LOCAL $REMOTE -o $MERGED
  22. [diff]
  23. tool = kdiff3
  24. [difftool "kdiff3"]
  25. cmd = \"C:\\\\Program Files\\\\KDiff3\\\\kdiff3\" $BASE $LOCAL $REMOTE
  26.  
  27. [filter "lfs"]
  28. clean = git-lfs clean -- %f
  29. smudge = git-lfs smudge -- %f
  30. required = true
  31. process = git-lfs filter-process
  32. [credential]
  33. helper = manager
  34. [winUpdater]
  35. recentlySeenVersion = 2.19.1.windows.1
  36. [difftool "sourcetree"]
  37. cmd = '' \"$LOCAL\" \"$REMOTE\"
  38. [mergetool "sourcetree"]
  39. cmd = "'' "
  40. trustExitCode = true
Add Comment
Please, Sign In to add comment