projects / openwrt / staging / ynezz.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: c463728) | 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)
commita1267290ed9332b0de65f97ab3222e747b7634d6
tree74cb35d6298a1f1d142d920b9d83cf75b126c217tree | snapshot
parentc463728b2d35651fd4cec9ec0379cdfd210a65b1commit | 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
Staging tree of Petr Stetiar