branch: allow -f with -m and -d