diff --git a/docs/contributing.md b/docs/contributing.md
index 3bc02398da..e7ecd6bfc7 100644
--- a/docs/contributing.md
+++ b/docs/contributing.md
@@ -27,7 +27,8 @@ information on using pull requests.
 
 Unlike many GitHub projects (but like many VCS projects), we care more about the
 contents of commits than about the contents of PRs. We review each commit
-separately, and we don't squash them when the PR is ready.
+separately, and we don't squash-merge the PR (so please manually squash any
+fixup commits before sending for review).
 
 Each commit should ideally do one thing. For example, if you need to refactor a
 function in order to add a new feature cleanly, put the refactoring in one