config 1.2 KB

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