summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen van Baarsen <jeroenvanbaarsen@gmail.com>2014-07-16 22:05:41 +0200
committerJeroen van Baarsen <jeroenvanbaarsen@gmail.com>2014-07-16 22:05:41 +0200
commitd5d6fc3d41e3738bc90a45389baa842a288c2011 (patch)
tree3578fc5c556b046da1dd5fd190c3b615936e912b
parentc300788830b07faca8669920e92c0a99193bbf5e (diff)
parentc899c294fd36ae6a1c7a45152e8b76b4f0d82b37 (diff)
downloadgitlab-ce-d5d6fc3d41e3738bc90a45389baa842a288c2011.tar.gz
Merge pull request #7257 from cirosantilli/patch-4
Clariy squash comes after review.
-rw-r--r--CONTRIBUTING.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index e7e4cbf39ac..0cb801c6c74 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