modify, add, modify again, don't stage, commit