AdeAttwood/Dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Ade Attwood 2022-02-15 20:40:56 +00:00
parent 24066acaf6
commit 073f6db85f
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
site-modules/core/templates/git/gitconfig.erb
View file

@ -10,9 +10,15 @@
editor = $ZSH/plugins/emacs/emacsclient.sh -nw editor = $ZSH/plugins/emacs/emacsclient.sh -nw
autocrlf = input autocrlf = input
[merge]
conflictstyle = diff3
[rerere] [rerere]
enabled = true enabled = true
[push]
default = current
[pager] [pager]
diff = delta --light diff = delta --light
log = delta --light log = delta --light