diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2017-02-12 22:20:46 +0000 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2017-02-12 22:20:46 +0000 |
commit | 89e5f49c418e419c1572ed7428d5100c32127e64 (patch) | |
tree | 703347f5d79d0605e531a553ba95925cfea98d91 /dgit | |
parent | 0476a4ac1e2e9c6658200a1d09c49080704f713b (diff) |
dgit: --deliberately-not-fast-forward works properly in split view quilt modes (suppressing the pseudomerge).
Diffstat (limited to 'dgit')
-rwxr-xr-x | dgit | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -3891,6 +3891,7 @@ sub splitbrain_pseudomerge ($$$$) { # return $dgitview unless defined $archive_hash; + return $dgitview if deliberately_not_fast_forward(); printdebug "splitbrain_pseudomerge...\n"; |