Merge pull request #38427 from thockin/git-attributes

Automatic merge from submit-queue (batch tested with PRs 38427, 39896, 39889, 39871, 39895) gitattributes for better reviews Reviewable will ignore files marked as -diff.

Merge pull request #38427 from thockin/git-attributes
22dc3dea · Kubernetes Submit Queue · GitHub · 29145ed9 · 3a769b89 · 22dc3dea
Commit 22dc3dea authored Jan 13, 2017 by Kubernetes Submit Queue Committed by GitHub Jan 13, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 0 deletions

.gitattributes .gitattributes +8 -0

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
+**/types.generated.go -diff
+**/generated.pb.go -diff
+**/generated.proto -diff
+**/types_swagger_doc_generated.go -diff
+docs/api-reference/** -diff
+federation/docs/api-reference/** -diff