github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 01:40:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #38427 from thockin/git-attributes

Browse Source 
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.
This commit is contained in:
Kubernetes Submit Queue 2017-01-13 20:21:34 -08:00 committed by GitHub
commit 22dc3deab0
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.gitattributes vendored
View File

@ -1,2 +1,10 @@
hack/verify-flags/known-flags.txt merge=union hack/verify-flags/known-flags.txt merge=union
test/test_owners.csv 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