diff options
| author | florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2013-09-02 18:25:10 +0000 |
|---|---|---|
| committer | florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2013-09-02 18:25:10 +0000 |
| commit | 5aeff18c2b8836c015a291da0638ea004c6033cf (patch) | |
| tree | 4111759f3a025bdcbad42c3fcc5353258ed55ccb /target/linux/ar7 | |
| parent | 870695cc86b7d78fafe2bde4e0201a24ad306093 (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
Diffstat (limited to 'target/linux/ar7')
0 files changed, 0 insertions, 0 deletions