Merge pull request #54766 from mikekap/patch-1

Automatic merge from submit-queue (batch tested with PRs 54875, 54813, 54595, 54947, 54766). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Make github hide generated files in diffs **What this PR does / why we need it**: https://github.com/github/linguist#generated-code says to add `linguist-generated=true` to any files that you don't want to see diffs in. IMO this will make PRs a little easier to review. e.g. the top half of https://github.com/kubernetes/kubernetes/pull/53988 should disappear **Which issue this PR fixes** **Special notes for your reviewer**: **Release note**: NONE

Merge pull request #54766 from mikekap/patch-1
4aaf39a5 · Kubernetes Submit Queue · GitHub · fcdbd060 · 4f9f0336 · 4aaf39a5
Unverified Commit 4aaf39a5 authored Nov 01, 2017 by Kubernetes Submit Queue Committed by GitHub Nov 01, 2017
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 5 deletions

.gitattributes .gitattributes +6 -5

No files found.
--- a/.gitattributes
+++ b/.gitattributes
 hack/verify-flags/known-flags.txt merge=union
 test/test_owners.csv merge=union
-**/zz_generated.*.go -diff
+**/zz_generated.*.go -diff linguist-generated=true
-**/types.generated.go -diff
+**/types.generated.go -diff linguist-generated=true
-**/generated.pb.go -diff
+**/generated.pb.go -diff linguist-generated=true
 **/generated.proto -diff
-**/types_swagger_doc_generated.go -diff
+**/types_swagger_doc_generated.go -diff linguist-generated=true
-docs/api-reference/** -diff
+docs/api-reference/** -diff linguist-generated=true
+api/swagger-spec/*.json -diff linguist-generated=true