Stage local add and rm for proper commit