diff options
| author | bors <bors@rust-lang.org> | 2022-12-30 22:55:51 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-12-30 22:55:51 +0000 |
| commit | 4839886f0abe208ab8f2bb73a3076a59fe2ab60c (patch) | |
| tree | 728a63d851443ca8da9351f6f0795d59c8bc83f9 /tests/rustdoc-js-std/parser-errors.js | |
| parent | ce85c98575e3016cf2007d90a85be321e592aa96 (diff) | |
| parent | 878af66b53459659b3f53f1c26af1123e82d79a0 (diff) | |
| download | rust-4839886f0abe208ab8f2bb73a3076a59fe2ab60c.tar.gz | |
Auto merge of #105058 - Nilstrieb:no-merge-commits-for-you-only-bors-is-allowed-to-do-that, r=jyn514
Add tidy check to deny merge commits
This will prevent users with the pre-push hook from pushing a merge commit.
Exceptions are added for subtree updates. These exceptions are a little hacky and may be non-exhaustive but can be extended in the future.
I added a link to `@jyn514's` blog post for the error case because that's the best resource to solve merge commits. But it would probably be better if it was integrated into https://rustc-dev-guide.rust-lang.org/git.html#no-merge-policy, then we could link that instead.
r? `@jyn514`
Diffstat (limited to 'tests/rustdoc-js-std/parser-errors.js')
0 files changed, 0 insertions, 0 deletions