From a1267290ed9332b0de65f97ab3222e747b7634d6 Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Mon, 2 Sep 2013 18:25:10 +0000 Subject: [PATCH] scripts/feeds: ensure that --ff is enabled Users may have merge.ff set to false, which will force merge commits to be generated. The intent here is to have a fast-forward merge when possible, so let's make sure fast-forwards are enabled. Signed-off-by: John Szakmeister Signed-off-by: Florian Fainelli SVN-Revision: 37884 --- scripts/feeds | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/feeds b/scripts/feeds index 383a0d80d9..680500d418 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' => {