git squash last two commits into one