1 files changed, 1 insertions, 1 deletions
diff --git a/dim b/dim
index 4b853e6d3fb6..5308d07aee00 100755
--- a/dim
+++ b/dim
@@ -945,7 +945,7 @@ function dim_apply_pull
 
 	checkpatch_commit_push_range "HEAD..FETCH_HEAD"
 
-	if ! $DRY git pull $pull_branch ; then
+	if ! $DRY git pull --no-ff $pull_branch ; then
 		if ! check_conflicts "$pull_branch" ; then
 			echoerr "Please resolve and then commit normally using git"