itsscb/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-11-03 13:13:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #5805

Browse Source 
5805: Encourage rebases more
 r=matklad a=matklad

bors r+
🤖

Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
This commit is contained in:
bors[bot] 2020-08-18 16:56:05 +00:00 committed by GitHub
commit b5fd0dd8a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/dev/style.md
View File

@ -239,8 +239,9 @@ If the line is too long, you want to split the sentence in two :-)
# Commit Style # Commit Style
We don't have specific rules around git history hygiene. 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. 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). 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. Such messages create a lot of duplicate notification traffic during rebases.