mirror of
git://git.openwrt.org/openwrt/openwrt.git
synced 2024-12-18 12:54:39 +00:00
a1267290ed
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 |
||
---|---|---|
.. | ||
config | ||
flashing | ||
abs2rel.pl | ||
arm-magic.sh | ||
brcmImage.pl | ||
bundle-libraries.sh | ||
checkpatch.pl | ||
clean-package.sh | ||
cleanfile | ||
cleanpatch | ||
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 | ||
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 |