aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/config.sub
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/config.sub
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/config.sub')
0 files changed, 0 insertions, 0 deletions