Merge branch 'stable' into HEAD

[dgit.git] / dgit

diff --git a/dgit b/dgit
index 42647ce02e79d277ef9a211e00eed5986387ffc3..9c7ec734e9f52c4371a31e817a3a392981c0f399 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";