diff --git a/scripts/feeds b/scripts/feeds
index 383a0d80d90bac2779e736548d960340000377fe..680500d418c88dda5a096d1cbce89ae1d9b4c8eb 100755
--- a/scripts/feeds
+++ b/scripts/feeds
@@ -119,7 +119,7 @@ my %update_method = (
 	'src-git' => {
 		'init'          => "git clone --depth 1 '%s' '%s'",
 		'init_branch'   => "git clone --depth 1 --branch '%s' '%s' '%s'",
-		'update'	=> "git pull",
+		'update'	=> "git pull --ff",
 		'controldir'	=> ".git",
 		'revision'	=> "git show --abbrev-commit HEAD | head -n 1 | cut -d ' ' -f 2 | tr -d '\n'"},
 	'src-gitsvn' => {