--- web/www/git.xhtml	2013/07/16 10:18:53	1.4
+++ web/www/git.xhtml	2013/08/04 14:47:10	1.5
@@ -116,6 +116,15 @@ git clone ssh://git@git.i-scream.org/libstatgrab
               specifically working with a developer on an issue
               already.
             </li>
+            <li>
+              Gratuitous merge commits should be avoided, particularly
+              when merging development branches to <code>master</code>.
+              They don't offer much in the way of useful information
+              and make operations like bisect harder. In particular,
+              if you pull changes to your local repository and end up
+              with a merge commit you should use rebase to get rid of
+              it before pushing.
+            </li>
           </ol>
         </div>
 <!--#include virtual="/footer.inc" -->