gaugendre/dotfiles
1
0
Fork 0
mirror of https://github.com/Crocmagnon/dotfiles.git synced 2024-09-19 17:07:40 +02:00
Code Issues Projects Releases Packages Wiki Activity

move git attributes file & configure merge for go.sum

Browse source
This commit is contained in:
Gabriel Augendre 2024-05-14 12:34:44 +02:00
parent aee23bbd8b
commit 962e2cea8d
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dot_config/git/attributes Normal file
View file

@ -0,0 +1,2 @@
go.sum merge=union

2
dot_config/git/private_config.tmpl
View file

@ -53,7 +53,7 @@
enabled = true enabled = true
[core] [core]
editor = nvim editor = nvim
attributesfile = {{ .chezmoi.homeDir }}/.gitattributes attributesfile = {{ .chezmoi.homeDir }}/.config/git/attributes
autocrlf = input autocrlf = input
[submodule] [submodule]
recurse = true recurse = true