dgit: --deliberately-not-fast-forward works properly in split view quilt modes (suppr...

[dgit.git] / dgit

diff --git a/dgit b/dgit
index 6b1201e7aee73dbc46cdcaa89b3c0b72987f49ce..caa2d75ce85e3ac3592d77a8eae47fa16b8213e7 100755 (executable)
--- 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";