diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-08-18 17:56:05 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-08-18 17:56:05 +0100 |
| commit | b5fd0dd8a17bf200e631c84555f0b9e383e6d10e (patch) | |
| tree | 101158d49665ab41826f0e3b9e28d2d3a766fc23 /docs | |
| parent | f18f9da7d80c669cf14bc2e85e40d883c621262a (diff) | |
| parent | 0c602bb963dc814caf48d7924002eb8aa3a6efd5 (diff) | |
Merge #5805
5805: Encourage rebases more
r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/dev/style.md | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/docs/dev/style.md b/docs/dev/style.md index 2454087e8..44f0956c2 100644 --- a/docs/dev/style.md +++ b/docs/dev/style.md | |||
| @@ -239,8 +239,9 @@ If the line is too long, you want to split the sentence in two :-) | |||
| 239 | # Commit Style | 239 | # Commit Style |
| 240 | 240 | ||
| 241 | We don't have specific rules around git history hygiene. | 241 | We don't have specific rules around git history hygiene. |
| 242 | Maintaining clean git history is encouraged, but not enforced. | 242 | Maintaining clean git history is strongly encouraged, but not enforced. |
| 243 | Use rebase workflow, it's OK to rewrite history during PR review process. | 243 | Use rebase workflow, it's OK to rewrite history during PR review process. |
| 244 | After you are happy with the state of the code, please use [interactive rebase](https://git-scm.com/book/en/v2/Git-Tools-Rewriting-History) to squash fixup commits. | ||
| 244 | 245 | ||
| 245 | Avoid @mentioning people in commit messages and pull request descriptions(they are added to commit message by bors). | 246 | Avoid @mentioning people in commit messages and pull request descriptions(they are added to commit message by bors). |
| 246 | Such messages create a lot of duplicate notification traffic during rebases. | 247 | Such messages create a lot of duplicate notification traffic during rebases. |