From c2f337ce97e130d9b1db8c3422dc0319fa857b9b Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Sun, 30 Sep 2018 21:05:26 +0200
Subject: [PATCH] vim-patch.sh: use --ff with git-pull

I have `merge.ff = no` in my Git config to not use fast-forward merges
by default, but when updating the Vim sources it should not cause a
merge commit.

[ci skip]
---
 scripts/vim-patch.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/vim-patch.sh b/scripts/vim-patch.sh
index bba76ffa97..2d7cbf4552 100755
--- a/scripts/vim-patch.sh
+++ b/scripts/vim-patch.sh
@@ -93,7 +93,7 @@ get_vim_sources() {
       exit 1
     fi
     echo "Updating Vim sources: ${VIM_SOURCE_DIR}"
-    git pull &&
+    git pull --ff &&
       msg_ok "Updated Vim sources." ||
       msg_err "Could not update Vim sources; ignoring error."
   fi