Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ We follow [Conventional Commits](https://www.conventionalcommits.org/):
[optional footer]
```

## Signed Commits
## Signed commits

Every commit that reaches the default branch must be signed; a ruleset refuses
unsigned pushes. Estate policy:
Expand All @@ -97,7 +97,9 @@ unsigned pushes. Estate policy:
as a *signing* key (`gpg.format=ssh`, `commit.gpgsign=true`). The committer
email must be verified on that account.
- **Apps, bots and workflows** never `git push` local commits. They write
through the API (`createCommitOnBranch`, the estate `signed-push` action, or a
squash merge) so that GitHub signs the commit.
- Merge PRs with **squash**. Rebase-merge replays commits unsigned and is
disabled.
through the API (`createCommitOnBranch` or the estate `signed-push` action)
so that GitHub signs each commit.
- Merge PRs with **squash**. The ruleset checks every commit on the PR branch,
not just the result, so one unsigned commit blocks the merge. Re-create such a
branch with signed commits (`git cherry-pick -S`) and open a new PR.
Rebase-merge replays commits unsigned and is disabled.
Loading