From 0c602bb963dc814caf48d7924002eb8aa3a6efd5 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Tue, 18 Aug 2020 18:52:12 +0200 Subject: Encourage rebases more --- docs/dev/style.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'docs/dev') 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 :-) # 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. -- cgit v1.2.3