aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/dot_config/git/attributes
diff options
context:
space:
mode:
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