Merge pull request #102 from phovea/rumersdorfer-gitattributes_dist

Update .gitattributes
phovea · Aug 21, 2020 · 4cb0b4b · 4cb0b4b
2 parents cbe082f + 93ed785
commit 4cb0b4b
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -125,3 +125,10 @@ AUTHORS text
 # with the python modules ``pickle``, ``dbm.*``,
 # ``shelve``, ``marshal``, ``anydbm``, & ``bsddb``
 # (among others).
+
+
+# Mark compiled files as generated to hide them in PRs
+/dist/** linguist-generated=true
+
+# Hide compiled files from git diff and auto-replace them when merging different branches
+/dist/** -diff -merge