Alias mff to merge --ff-only