aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2013-09-02 18:25:10 +0000
committerFlorian Fainelli <florian@openwrt.org>2013-09-02 18:25:10 +0000
commita1267290ed9332b0de65f97ab3222e747b7634d6 (patch)
tree74cb35d6298a1f1d142d920b9d83cf75b126c217 /scripts
parentc463728b2d35651fd4cec9ec0379cdfd210a65b1 (diff)
downloadupstream-a1267290ed9332b0de65f97ab3222e747b7634d6.tar.gz
upstream-a1267290ed9332b0de65f97ab3222e747b7634d6.tar.bz2
upstream-a1267290ed9332b0de65f97ab3222e747b7634d6.zip
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 <john@szakmeister.net> Signed-off-by: Florian Fainelli <florian@openwrt.org> SVN-Revision: 37884
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/feeds2
1 files changed, 1 insertions, 1 deletions
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' => {