Add note on merge commits.

diff --git a/www/git.xhtml b/www/git.xhtml
index 2fc8a8a41463c38624d8a95a0126ffd1c5722a0e..448db0fce879b3eec4c0ea794f44061984ee0701 100644 (file)
--- a/www/git.xhtml
+++ b/www/git.xhtml
@@ -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" -->