diff options
| author | florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2013-09-02 18:25:10 +0000 |
|---|---|---|
| committer | florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2013-09-02 18:25:10 +0000 |
| commit | 5aeff18c2b8836c015a291da0638ea004c6033cf (patch) | |
| tree | 4111759f3a025bdcbad42c3fcc5353258ed55ccb | |
| parent | 870695cc86b7d78fafe2bde4e0201a24ad306093 (diff) | |
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
| -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' => { |