diff options
| author | Aleksey Kladov <aleksey.kladov@gmail.com> | 2020-08-18 18:52:12 +0200 |
|---|---|---|
| committer | Aleksey Kladov <aleksey.kladov@gmail.com> | 2020-08-18 18:52:12 +0200 |
| commit | 0c602bb963dc814caf48d7924002eb8aa3a6efd5 (patch) | |
| tree | 3afd7ca0ca87ad5a761372e633959356b804f205 /docs/dev | |
| parent | aa2def023e6b0aa8a68f4992423f566d435e55c6 (diff) | |
| download | rust-0c602bb963dc814caf48d7924002eb8aa3a6efd5.tar.gz rust-0c602bb963dc814caf48d7924002eb8aa3a6efd5.zip | |
Encourage rebases more
Diffstat (limited to 'docs/dev')
| -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 2454087e89d..44f0956c247 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 :-) # Commit Style We don't have specific rules around git history hygiene. -Maintaining clean git history is encouraged, but not enforced. +Maintaining clean git history is strongly encouraged, but not enforced. Use rebase workflow, it's OK to rewrite history during PR review process. +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. Avoid @mentioning people in commit messages and pull request descriptions(they are added to commit message by bors). Such messages create a lot of duplicate notification traffic during rebases. |