From 020c7e327a768f85c84072c0275526b296dcdc49 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Tue, 6 Sep 2016 10:51:51 +0200
Subject: [PATCH] Add note in CONTRIBUTING.md about removing merge commits from
 PRs

---
 CONTRIBUTING.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 15cad87de..2dfb38636 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -11,6 +11,8 @@ to make the change, other impacts, future work etc. Keeping the title
 to 72 characters means it will display fully in git log and github logs.
 ```
 
+Merge commits should not be included in pull requests as they just muddy the history, please rebase when bringing code up to date against latest master.
+
 Code formatting
 ---------------