diff options
| author | Tim Smith <tsmith@chef.io> | 2018-10-29 09:28:00 -0700 |
|---|---|---|
| committer | Tim Smith <tsmith@chef.io> | 2018-10-29 09:28:00 -0700 |
| commit | 6e9ae6d574345adb2de9c2ea7a42b4c854415d70 (patch) | |
| tree | ed02d5646bd6a1214bf1ddecd9a785a34360b22b | |
| parent | 44972dce3667fde32cad0543ee8e70f0c439cae7 (diff) | |
| download | chef-6e9ae6d574345adb2de9c2ea7a42b4c854415d70.tar.gz | |
Misc git file updates
Signed-off-by: Tim Smith <tsmith@chef.io>
| -rw-r--r-- | .gitattributes | 3 | ||||
| -rw-r--r-- | .github/CODEOWNERS | 6 | ||||
| -rw-r--r-- | .github/PULL_REQUEST_TEMPLATE.md | 2 |
3 files changed, 5 insertions, 6 deletions
diff --git a/.gitattributes b/.gitattributes index bb9914a8b6..f41db8b6c1 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,6 +1,3 @@ # git config merge.ignore.name 'ignore changes merge driver' # git config merge.ignore.driver 'touch %A' -distro/common/html/* merge=ignore -distro/common/man/man1/* merge=ignore -distro/common/man/man8/* merge=ignore lib/chef/version.rb merge=ignore diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index fee8d42d91..b4eac50d28 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1,4 +1,6 @@ # Order is important. The last matching pattern has the most precedence. -* @chef/client-maintainers -.expeditor/** @chef/jex-team +* @chef/client-maintainers +.expeditor/** @chef/jex-team +README.md @chef/docs-team +RELEASE_NOTES.md @chef/docs-team diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index aca7c10237..6abaccc467 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -11,5 +11,5 @@ StackOverflow discussion that's relevant] - [ ] New functionality includes tests - [ ] All tests pass -- [ ] RELEASE\_NOTES.md, has been updated if required (not required for bugfixes, required for API changes) +- [ ] RELEASE\_NOTES.md has been updated if required (not required for bugfixes, required for API changes) - [ ] All commits have been signed-off for the Developer Certificate of Origin. See <https://github.com/chef/chef/blob/master/CONTRIBUTING.md#developer-certification-of-origin-dco> |