From 962e2cea8d6288d8173417815421d279b7d06f2d Mon Sep 17 00:00:00 2001
From: Gabriel Augendre <gabriel@augendre.info>
Date: Tue, 14 May 2024 12:34:44 +0200
Subject: [PATCH] move git attributes file & configure merge for go.sum

---
 dot_config/git/attributes          | 2 ++
 dot_config/git/private_config.tmpl | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 dot_config/git/attributes

diff --git a/dot_config/git/attributes b/dot_config/git/attributes
new file mode 100644
index 0000000..1179a64
--- /dev/null
+++ b/dot_config/git/attributes
@@ -0,0 +1,2 @@
+go.sum merge=union
+
diff --git a/dot_config/git/private_config.tmpl b/dot_config/git/private_config.tmpl
index 5989fa4..c012ede 100644
--- a/dot_config/git/private_config.tmpl
+++ b/dot_config/git/private_config.tmpl
@@ -53,7 +53,7 @@
   enabled = true
 [core]
     editor = nvim
-    attributesfile = {{ .chezmoi.homeDir }}/.gitattributes
+    attributesfile = {{ .chezmoi.homeDir }}/.config/git/attributes
     autocrlf = input
 [submodule]
   recurse = true