scripts/feeds: ensure that --ff is enabled
authorFlorian Fainelli <florian@openwrt.org>
Mon, 2 Sep 2013 18:25:10 +0000 (18:25 +0000)
committerFlorian Fainelli <florian@openwrt.org>
Mon, 2 Sep 2013 18:25:10 +0000 (18:25 +0000)
commit8f5a397e4d0dc623159c3d31657edc624ebcecfb
tree4111759f3a025bdcbad42c3fcc5353258ed55ccb
parente72590431149ea4bb65199b92d7a460ec3d6926d
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
scripts/feeds