diff options
| author | Florian Fainelli <florian@openwrt.org> | 2013-09-02 18:25:10 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2013-09-02 18:25:10 +0000 |
| commit | 8f5a397e4d0dc623159c3d31657edc624ebcecfb (patch) | |
| tree | 4111759f3a025bdcbad42c3fcc5353258ed55ccb /scripts | |
| parent | e72590431149ea4bb65199b92d7a460ec3d6926d (diff) | |
| download | upstream-8f5a397e4d0dc623159c3d31657edc624ebcecfb.tar.gz upstream-8f5a397e4d0dc623159c3d31657edc624ebcecfb.tar.bz2 upstream-8f5a397e4d0dc623159c3d31657edc624ebcecfb.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>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37884 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/feeds | 2 |
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' => { |