github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-22 19:31:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #54766 from mikekap/patch-1

Browse Source 
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
This commit is contained in:
Kubernetes Submit Queue 2017-11-01 18:45:37 -07:00 committed by GitHub
commit 4aaf39a5c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
.gitattributes vendored
View File

@ -1,9 +1,10 @@
hack/verify-flags/known-flags.txt merge=union
test/test_owners.csv merge=union
**/zz_generated.*.go -diff
**/types.generated.go -diff
**/generated.pb.go -diff
**/zz_generated.*.go -diff linguist-generated=true
**/types.generated.go -diff linguist-generated=true
**/generated.pb.go -diff linguist-generated=true
**/generated.proto -diff
**/types_swagger_doc_generated.go -diff
docs/api-reference/** -diff
**/types_swagger_doc_generated.go -diff linguist-generated=true
docs/api-reference/** -diff linguist-generated=true
api/swagger-spec/*.json -diff linguist-generated=true