From c899c294fd36ae6a1c7a45152e8b76b4f0d82b37 Mon Sep 17 00:00:00 2001 From: Ciro Santilli Date: Fri, 4 Jul 2014 08:14:34 +0200 Subject: Clariy squash comes after review. So people don't focus on writing good commit messages for a bunch of unrelated fixes. --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a08ffa449d8..b11e89aefb4 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -98,7 +98,7 @@ For examples of feedback on merge requests please look at already [closed merge 1. Contains functionality we think other users will benefit from too 1. Doesn't add configuration options since they complicate future changes 1. Initially contains a single commit (please use `git rebase -i` to squash commits) -1. Changes after submitting the merge request should be in separate commits (no squashing) +1. Changes after submitting the merge request should be in separate commits (no squashing). You will be asked to squash when the review is over, before merging. 1. It conforms to the following style guides ## Style guides -- cgit v1.2.1