summaryrefslogtreecommitdiff
path: root/dgit
diff options
context:
space:
mode:
Diffstat (limited to 'dgit')
-rwxr-xr-xdgit1
1 files changed, 1 insertions, 0 deletions
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";