aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMohammad Akhlaghi <mohammad@akhlaghi.org>2020-05-01 22:37:32 +0100
committerMohammad Akhlaghi <mohammad@akhlaghi.org>2020-05-01 22:37:32 +0100
commit7fee88631998449ba9572dc491e4401189bdedfe (patch)
tree912c96fa8ddb866f0f4181dcd80066dd8dd3f127
parentdf878cc2dc80ea09e09617949869ab7044d3c3c3 (diff)
Added a .gitattributes file to avoid merging some files
As explained in the new `README-hacking.md', this files greatly helps in avoiding un-necessary conflicts.
-rw-r--r--.gitattributes6
1 files changed, 6 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..280f260
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,6 @@
+paper.tex merge=ours
+tex/src/delete-me.mk merge=ours
+tex/src/delete-me-demo.mk merge=ours
+reproduce/analysis/make/delete-me.mk merge=ours
+reproduce/software/config/TARGETS.conf merge=ours
+reproduce/analysis/config/delete-me-num.conf merge=ours \ No newline at end of file