aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/dot_config/git/attributes
diff options
context:
space:
mode:
authorLibravatar sommerfeld <sommerfeld@sommerfeld.dev>2026-04-21 01:23:18 +0100
committerLibravatar sommerfeld <sommerfeld@sommerfeld.dev>2026-04-21 01:23:18 +0100
commitd00bf2cb2d5087164fa509a4f20a2be62a519044 (patch)
treee788986ca341fa7a9d7327b48c58d2e0c0c43115 /dot_config/git/attributes
parent9b2af4dd6c73ea57cc921f41120db7a2700e806d (diff)
downloaddotfiles-d00bf2cb2d5087164fa509a4f20a2be62a519044.tar.gz
dotfiles-d00bf2cb2d5087164fa509a4f20a2be62a519044.tar.bz2
dotfiles-d00bf2cb2d5087164fa509a4f20a2be62a519044.zip
refactor: restructure to chezmoi source state
Rename home/ contents to chezmoi naming conventions: - dot_ prefix for dotfiles and dot-dirs - private_dot_ for .gnupg and .ssh directories - private_ for 0600 files (nym.pub) - executable_ for scripts in .local/bin and display-toggle.sh - symlink_ for mimeapps.list symlink
Diffstat (limited to 'dot_config/git/attributes')
-rw-r--r--dot_config/git/attributes26
1 files changed, 26 insertions, 0 deletions
diff --git a/dot_config/git/attributes b/dot_config/git/attributes
new file mode 100644
index 0000000..a9faf44
--- /dev/null
+++ b/dot_config/git/attributes
@@ -0,0 +1,26 @@
+*.java merge=mergiraf
+*.rs merge=mergiraf
+*.go merge=mergiraf
+*.js merge=mergiraf
+*.jsx merge=mergiraf
+*.json merge=mergiraf
+*.yml merge=mergiraf
+*.yaml merge=mergiraf
+*.toml merge=mergiraf
+*.html merge=mergiraf
+*.htm merge=mergiraf
+*.xhtml merge=mergiraf
+*.xml merge=mergiraf
+*.c merge=mergiraf
+*.h merge=mergiraf
+*.cc merge=mergiraf
+*.cpp merge=mergiraf
+*.hpp merge=mergiraf
+*.cs merge=mergiraf
+*.dart merge=mergiraf
+*.scala merge=mergiraf
+*.sbt merge=mergiraf
+*.ts merge=mergiraf
+*.tsx merge=mergiraf
+*.py merge=mergiraf
+*.lua merge=mergiraf