Merge ff57846 into dedc71b

project-chip · Sep 24, 2021 · 2382759 · 2382759
2 parents dedc71b + ff57846
commit 2382759
Show file tree

Hide file tree

Showing 1,983 changed files with 142,221 additions and 92,361 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,2 +1,8 @@
-# Mark all files in the "gen" folders as auto-generated to hide them in diffs
+# Mark all files in generated folders as auto-generated to hide them in diffs
 **/gen/** linguist-generated
+# Same for files in zap-generated folders
+**/zap-generated/** linguist-generated
+# And some specific generated files
+src/controller/python/chip/clusters/CHIPClusters.cpp linguist-generated
+src/controller/python/chip/clusters/CHIPClusters.py linguist-generated
+src/darwin/Framework/CHIPTests/CHIPClustersTests.m linguist-generated