add command to review diff before merging; remove erroneous "git update" command