Florian Fainelli a1267290ed 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		2013-09-02 18:25:10 +00:00
..
config
flashing
abs2rel.pl
arm-magic.sh
brcmImage.pl
bundle-libraries.sh
checkpatch.pl	scripts/checkpatch.pl: Fix whitespace errors	2013-08-31 11:16:49 +00:00
clean-package.sh
cleanfile	scripts/{cleanfile,cleanpatch}: Add scripts for cleaning up file and patch whitespaces	2013-08-31 11:16:44 +00:00
cleanpatch	scripts/{cleanfile,cleanpatch}: Add scripts for cleaning up file and patch whitespaces	2013-08-31 11:16:44 +00:00
combined-ext-image.sh
combined-image.sh
config.guess
config.rpath
config.sub
deptest.sh
diffconfig.sh
dl_cleanup.py
download.pl
env
ext-toolchain.sh
feeds	scripts/feeds: ensure that --ff is enabled	2013-09-02 18:25:10 +00:00
freebsd.sh
gen-dependencies.sh
getver.sh
ipkg
ipkg-make-index.sh
kconfig.pl
make-ipkg-dir.sh
md5sum
metadata.pl
metadata.pm
om-fwupgradecfg-gen.sh
openbsd.sh
pad_image
patch-kernel.sh
patch-specs.sh
relink-lib.sh
remote-gdb
rstrip.sh
slugimage.pl
strip-kmod.sh
symlink-tree.sh
timestamp.pl
update-package-md5sum