Guest User

Untitled

a guest
May 16th, 2018
148
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 1.52 KB | None | 0 0
  1. [user]
  2. name = Alejandro Tapia
  3. email = ageofzetta@gmail.com
  4. [color]
  5. ui = auto
  6. [color "branch"]
  7. current = yellow reverse
  8. local = yellow
  9. remote = green
  10. [color "diff"]
  11. meta = yellow bold
  12. frag = magenta bold
  13. old = red bold
  14. new = green bold
  15. [color "status"]
  16. added = green
  17. changed = red
  18. untracked = yellow
  19. [core]
  20. editor = vim
  21. excludesfile = /Users/alejandrotapia/.gitignore_global
  22. [push]
  23. default = simple
  24. [diff]
  25. tool = diffmerge
  26. [difftool "diffmerge"]
  27. cmd = diffmerge \"$LOCAL\" \"$REMOTE\"
  28. [merge]
  29. tool = diffmerge
  30. [mergetool "diffmerge"]
  31. cmd = "diffmerge --merge --result=\"$MERGED\" \"$LOCAL\" \"$(if test -f \"$BASE\"; then echo \"$BASE\"; else echo \"$LOCAL\"; fi)\" \"$REMOTE\""
  32. trustExitCode = true
  33. [alias]
  34. assume = update-index --assume-unchanged
  35. unassume = update-index --no-assume-unchanged
  36. assumed = "!git ls-files -v | grep ^h | cut -c 3-"
  37. b = branch
  38. a = add
  39. s = status
  40. f = fetch
  41. co = checkout
  42. cob = checkout -b
  43. ci = commit --verbose
  44. cia = commit -a --verbose
  45. cim = commit -m
  46. ciam = commit -a -m
  47. pr = pull --rebase
  48. pl = pull
  49. ps = push
  50. cp = cherry-pick
  51. rst = reset
  52. ll = log --pretty=format:"%C(yellow)%h\\ %ad%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --date=short
  53. [filter "lfs"]
  54. clean = git-lfs clean %f
  55. smudge = git-lfs smudge %f
  56. required = true
  57.  
  58.  
  59. [difftool "sourcetree"]
  60. cmd = opendiff \"$LOCAL\" \"$REMOTE\"
  61. path =
  62. [mergetool "sourcetree"]
  63. cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
  64. trustExitCode = true
Add Comment
Please, Sign In to add comment