Add section on squashing commits into the conventions

plone · Sep 4, 2015 · 8284176 · 8284176
1 parent 92bb853
commit 8284176
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/docs/contribute/conventions.rst b/docs/contribute/conventions.rst
@@ -603,3 +603,9 @@ is widely considered the gold standard:
 `Github flavored markdown
 <http://github.github.com/github-flavored-markdown/>`_
 is also useful in commit messages.
+
+Squashing commits
+-----------------
+
+In order to keep a clear and concise git history, it is good practice to squash commits before merging.
+Use ``git rebase --interactive`` to squash all commits that you think are unnecessary.