projects / openwrt / svn-archive / archive.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 2c72846) | patch
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)
commitd5fcfc7b0574064b091f8cdc58445b00dbf6690f
tree4111759f3a025bdcbad42c3fcc5353258ed55ccbtree | snapshot
parent2c7284631f8fc294588b9acbe7a00b2403939a7ccommit | 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>
SVN-Revision: 37884
scripts/feeds diff | blob | history
OpenWrt SVN history