refactor(git): update conflict style and set default branch

2022-02-15 20:40:56 +00:00 · 2022-02-15 20:40:56 +00:00 · 073f6db85f
commit 073f6db85f
parent 24066acaf6
1 changed files with 6 additions and 0 deletions
--- a/site-modules/core/templates/git/gitconfig.erb
+++ b/site-modules/core/templates/git/gitconfig.erb
@ -10,9 +10,15 @@
  editor = $ZSH/plugins/emacs/emacsclient.sh -nw
  autocrlf = input

+[merge]
+  conflictstyle = diff3
+
 [rerere]
  enabled = true

+[push]
+  default = current
+
 [pager]
  diff = delta --light
  log = delta --light