soft reset and squashing commit history