[PATCH] dim: Don't fast-forward in apply-pull

[Daniel Vetter]

Obvious oversight.

Signed-off-by: Daniel Vetter <daniel.vetter at intel.com>
---
 dim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dim b/dim
index ddfb809fcc5c..33acacb24790 100755
--- a/dim
+++ b/dim
@@ -969,7 +969,7 @@ function dim_apply_pull
 
 	checkpatch_commit_push_range 0 "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"
 
-- 
2.17.0