projects / openwrt.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 870695c) | patch
scripts/feeds: ensure that --ff is enabled
authorflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Mon, 2 Sep 2013 18:25:10 +0000 (18:25 +0000)
committerflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Mon, 2 Sep 2013 18:25:10 +0000 (18:25 +0000)
commit5aeff18c2b8836c015a291da0638ea004c6033cf
tree4111759f3a025bdcbad42c3fcc5353258ed55ccbtree | snapshot
parent870695cc86b7d78fafe2bde4e0201a24ad306093commit | 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
scripts/feeds diff | blob | history
OpenWrt main development branch