Dotfiles, utilities, and other apparatus.
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

58 lines
1.4 KiB

  1. [alias]
  2. a = add
  3. amend = commit -a --amend
  4. br = branch
  5. c = commit
  6. changelog = log --date=short --pretty='format:%d %ad %s'
  7. ci = commit
  8. cm = commit -m
  9. co = checkout
  10. d = diff
  11. df = diff
  12. exec = "!exec "
  13. go = checkout
  14. l = log
  15. lg = log -p
  16. lol = log --graph --decorate --pretty=oneline --abbrev-commit
  17. lola = log --graph --decorate --pretty=oneline --abbrev-commit --all
  18. log-notes = !git fetch origin refs/notes/review:refs/notes/review && git log --notes=review
  19. p = pull
  20. pul = pull
  21. root = rev-parse --show-toplevel
  22. s = status
  23. st = status
  24. stat = status
  25. sub = submodule
  26. push-gerrit = !git push origin HEAD:refs/for/${1:-`git rev-parse --abbrev-ref HEAD`}
  27. # TODO: add other team usernames:
  28. push-gerrit-tyler = !git push origin HEAD:refs/for/${1:-`git rev-parse --abbrev-ref HEAD`}%r=thcipriani
  29. push-gerrit-wip = !git push origin HEAD:refs/for/${1:-`git rev-parse --abbrev-ref HEAD`}%wip
  30. # Handle accidentally typing git twice:
  31. git = !git
  32. [user]
  33. name = Brennen Bearnes
  34. email = code@p1k3.com
  35. [color]
  36. branch = auto
  37. diff = auto
  38. interactive = auto
  39. status = auto
  40. ui = auto
  41. [gui]
  42. [push]
  43. default = simple
  44. [credential]
  45. helper = gnome-keyring
  46. [status]
  47. submoduleSummary = true
  48. [gitreview]
  49. remote = origin
  50. username = brennen
  51. [commit]
  52. template = ~/cheatsheets/git-commit.txt
  53. [url "ssh://gerrit.wikimedia.org:29418"]
  54. pushInsteadOf = https://gerrit.wikimedia.org/r