From: Karel Zak Date: Tue, 6 Jun 2017 10:07:26 +0000 (+0200) Subject: Merge branch 'rename-nooverride' of https://github.com/dov/util-linux X-Git-Tag: v2.31-rc1~333 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5fba8b758cf4d64c21dba81ea30bcc11f2e1d3ee;p=thirdparty%2Futil-linux.git Merge branch 'rename-nooverride' of https://github.com/dov/util-linux * 'rename-nooverride' of https://github.com/dov/util-linux: Changed "override" to "overwrite" rename option. Added --no-override option to rename. --- 5fba8b758cf4d64c21dba81ea30bcc11f2e1d3ee