Clear up short option confusion between --from and --force (-f is now --from, and there is no short option for --force).