From 89e5f49c418e419c1572ed7428d5100c32127e64 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 12 Feb 2017 22:20:46 +0000
Subject: dgit: --deliberately-not-fast-forward works properly in split view
 quilt modes (suppressing the pseudomerge).

---
 dgit | 1 +
 1 file changed, 1 insertion(+)

(limited to 'dgit')

diff --git a/dgit b/dgit
index 6b1201e..caa2d75 100755
--- a/dgit
+++ b/dgit
@@ -3891,6 +3891,7 @@ sub splitbrain_pseudomerge ($$$$) {
     #
 
     return $dgitview unless defined $archive_hash;
+    return $dgitview if deliberately_not_fast_forward();
 
     printdebug "splitbrain_pseudomerge...\n";
 
-- 
cgit v1.2.3