config 1.3 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950
  1. [user]
  2. name = Thomas Dy
  3. email = thatsmydoing@gmail.com
  4. [merge]
  5. conflictstyle = diff3
  6. [core]
  7. autocrlf = input
  8. hooksPath = /dev/null
  9. [delta]
  10. features = side-by-side line-numbers decorations
  11. whitespace-error-style = 22 reverse
  12. [delta "decorations"]
  13. commit-decoration-style = bold yellow box ul
  14. file-style = bold yellow ul
  15. file-decoration-style = none
  16. [color]
  17. ui = true
  18. [diff]
  19. algorithm = patience
  20. [difftool]
  21. prompt = false
  22. [difftool "difft"]
  23. cmd = difft "$LOCAL" "$REMOTE"
  24. [push]
  25. default = current
  26. [branch]
  27. autoSetupMerge = inherit
  28. [remote]
  29. pushDefault = origin
  30. [alias]
  31. root = !pwd
  32. assume = update-index --assume-unchanged
  33. unassume = update-index --no-assume-unchanged
  34. assumed = "!git ls-files -v | grep ^h | cut -c 3-"
  35. lg = "log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%C(bold blue)<%an>%Creset' --abbrev-commit"
  36. po = push origin
  37. pof = push origin --force-with-lease
  38. p = push
  39. pf = push --force-with-lease
  40. ff = merge --ff-only
  41. roh = rebase origin/HEAD
  42. rioh = rebase -i origin/HEAD
  43. ru = rebase @{upstream}
  44. riu = rebase -i @{upstream}
  45. ca = commit --amend
  46. smash = "!git add -u && git ca --no-edit && git pof"
  47. reset-head = remote set-head origin -a
  48. ff-head = "!git push . origin/HEAD:$(git head)"
  49. head = for-each-ref --format="%(symref:lstrip=-1)" refs/remotes/origin/HEAD
  50. sh = "!git switch $(git head)"