Merge branch 'stable'

[dgit.git] / dgit

diff --git a/dgit b/dgit
index 51975965deb49aad24c205848e0ca5170983185b..b8d6826928af835898ef5ea85a032ce7682a4758 100755 (executable)
--- 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";