X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit;h=9c7ec734e9f52c4371a31e817a3a392981c0f399;hp=42647ce02e79d277ef9a211e00eed5986387ffc3;hb=4d5ef701bf95a1c60a5cc1b9f5c4d771ac49375a;hpb=a80f7d09b0f92b5e1bc39f828f7972f3ff7c41be

diff --git a/dgit b/dgit
index 42647ce0..9c7ec734 100755
--- a/dgit
+++ b/dgit
@@ -3913,6 +3913,7 @@ sub splitbrain_pseudomerge ($$$$) {
     #
 
     return $dgitview unless defined $archive_hash;
+    return $dgitview if deliberately_not_fast_forward();
 
     printdebug "splitbrain_pseudomerge...\n";