One of the 24 questions in this topic
The --soft flag removes the commit from history but leaves the files ready in the staging area.