force flag and useShortCommit option