From: Tim Bishop <tim@bishnet.net>
Date: Sun, 4 Aug 2013 14:47:10 +0000 (+0000)
Subject: Add note on merge commits.
X-Git-Url: http://git.i-scream.org/?p=www.i-scream.org.git;a=commitdiff_plain;h=e9eec15aecc1b06ce5359015428013d621e3f479

Add note on merge commits.
---

diff --git a/www/git.xhtml b/www/git.xhtml
index 2fc8a8a..448db0f 100644
--- 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" -->