2 files changed, 3 insertions, 12 deletions

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
index d78a14e2c..73892ddaa 100644
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1,12 +1,2 @@
-# These are supported funding model platforms
-
-github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
-patreon: # Replace with a single Patreon username
+github: rust-analyzer
 open_collective: rust-analyzer
-ko_fi: # Replace with a single Ko-fi username
-tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
-community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
-liberapay: # Replace with a single Liberapay username
-issuehunt: # Replace with a single IssueHunt username
-otechie: # Replace with a single Otechie username
-custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
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.