Everything to get a working desktop with my config. Lots of Emacs stuff though. https://phundrak.com/config
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.

95 lines
2.1KB

  1. [user]
  2. email = lucien@phundrak.com
  3. name = Lucien Cartier-Tilet
  4. signingkey = BD7789E705CB8DCA
  5. [core]
  6. # editor = vim
  7. whitespace = fix,-indent-with-non-tab,trailing-space
  8. excludesfile = /home/phundrak/dotfiles/.gitignore_global
  9. autocrlf = false
  10. [web]
  11. browser = firefox
  12. [color]
  13. ui = auto
  14. [alias]
  15. a = add --all
  16. ####
  17. b = branch
  18. ####
  19. c = commit -S
  20. ca = commit -a
  21. cm = commit -m
  22. cam = commit -am
  23. ####
  24. co = checkout
  25. cob = checkout -b
  26. ####
  27. cl = clone
  28. ####
  29. d = diff -w
  30. ####
  31. l = log --oneline --graph --decorate
  32. ####
  33. ps = push
  34. psf = push -f
  35. pso = push origin
  36. psfo = push -f origin
  37. psom = push origin master
  38. psfom = push -f origin master
  39. ####
  40. pl = pull
  41. pb = pull --rebase
  42. ####
  43. re = reset
  44. reh = reset --hard
  45. rehh = reset --hard HEAD
  46. ####
  47. r = remote
  48. ra = remote add
  49. rr = remote rm
  50. ###
  51. rmf = rm -f
  52. rmrf = rm -r -f
  53. ####
  54. s = status
  55. sm = submodule
  56. sms = submodule status
  57. sma = submodule add
  58. smu = submodule update
  59. smui = submodule update --init
  60. smuir = submodule update --init --recursive
  61. ####
  62. staged = diff --cached
  63. ####
  64. sc = stash clear
  65. sp = stash pop
  66. sw = stash show
  67. ####
  68. pushall = !git remote | xargs -L1 git push
  69. psl = !git remote | xargs -L1 git push
  70. pullall = !git remote | xargs -L1 git pull
  71. pll = !git remote | xargs -L1 git pull
  72. ####
  73. u = reset --
  74. unstage = reset --
  75. ####
  76. webui = !/home/phundrak/.git-webui/release/libexec/git-core/git-webui
  77. [magithub]
  78. online = true
  79. [magithub "status"]
  80. includeStatusHeader = true
  81. includePullRequestsSection = true
  82. includeIssuesSection = true
  83. [gpg]
  84. program = gpg2
  85. [webui]
  86. autoupdate = true
  87. [mergetool.ediff]
  88. cmd = emacs --eval \" (progn (defun ediff-write-merge-buffer () (let ((file ediff-merge-store-file)) (set-buffer ediff-buffer-C) (write-region (point-min) (point-max) file) (message \\\"Merge buffer saved in: %s\\\" file) (set-buffer-modified-p nil) (sit-for 1))) (setq ediff-quit-hook 'kill-emacs ediff-quit-merge-hook 'ediff-write-merge-buffer) (ediff-merge-files-with-ancestor \\\"$LOCAL\\\" \\\"$REMOTE\\\" \\\"$BASE\\\" nil \\\"$MERGED\\\"))\"
  89. [merge]
  90. tool = ediff
  91. [github]
  92. user = phundrak
  93. [commit]
  94. gpgsign = true