From e83bd1a64daa1a32f06f6deb7cd064178e7a6d18 Mon Sep 17 00:00:00 2001
From: Olivier Bilodeau <olivier@bottomlesspit.org>
Date: Tue, 8 May 2012 15:56:10 -0400
Subject: [PATCH] no auto fast-forwards for the integration branch

---
 .gitconfig | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitconfig b/.gitconfig
index 411687de6db2..64bbf04f6735 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,6 +1,9 @@
 # fast forwards merges makes undoing topic branches harder than it should be
 # also the commit graphs are uglier
 # http://nvie.com/posts/a-successful-git-branching-model/
+[branch "integration"]
+mergeoptions = --no-ff
+
 [branch "devel"]
 mergeoptions = --no-ff