Advertisement
Guest User

Untitled

a guest
Jul 21st, 2018
202
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 1.76 KB | None | 0 0
  1. [user]
  2. name = Jeroen Gordijn
  3. email = jeroen.gordijn@gmail.com
  4. [color]
  5. ui= auto
  6. status = auto
  7. branch = auto
  8. diff = auto
  9. [color "branch"]
  10. current = green reverse
  11. local = green
  12. remote = red
  13. [color "diff"]
  14. meta = yellow bold
  15. frag = magenta bold
  16. old = red bold
  17. new = green bold
  18. whitespace = red reverse
  19. [color "status"]
  20. added = yellow
  21. changed = green
  22. untracked = cyan
  23. [core]
  24. whitespace=fix,-indent-with-non-tab,trailing-space,cr-at-eol
  25. excludesfile = /Users/jgordijn/.gitignore_global
  26. autocrlf = input
  27. [alias]
  28. st = status
  29. ci = commit
  30. br = branch
  31. co = checkout
  32. df = diff
  33. lg = log -p
  34. glog = log --graph
  35. mt = mergetool
  36. ls = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate
  37. ll = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --numstat
  38. lnc = log --pretty=format:"%h\\ %s\\ [%cn]"
  39. lds = log --pretty=format:"%C(yellow)%h\\ %ad%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --date=short
  40. ld = log --pretty=format:"%C(yellow)%h\\ %ad%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --date=relative
  41. le = log --oneline --decorate
  42.  
  43. [difftool "sourcetree"]
  44. cmd = opendiff \"$LOCAL\" \"$REMOTE\"
  45. path =
  46. [mergetool "sourcetree"]
  47. cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
  48. trustExitCode = true
  49. [push]
  50. default = simple
  51. [filter "media"]
  52. clean = git-media-clean %f
  53. smudge = git-media-smudge %f
  54. [credential]
  55. helper = osxkeychain
  56. [merge]
  57. tool = p4merge
  58. [mergetool "p4merge"]
  59. trustExitCode = false
  60. [filter "lfs"]
  61. clean = git-lfs clean -- %f
  62. smudge = git-lfs smudge -- %f
  63. process = git-lfs filter-process
  64. required = true
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement