reset --soft
는 [Practical uses of git reset --soft? - Stack Overflow]에 있는 리플 참조.
So, each time: you are satisfied with what you end up with (in term of working tree and index) you are not satisfied with all the commits that took you to get there: git reset --soft is the answer.