git checkout feature
git rebase -i HEAD~2
...
pick f45a1c3 added comment
squash ea54235 fixed comment
# Rebase c2d5714..ea54235 onto c2d5714
# Commands:
# p, pick = use commit
# r, reword = use commit, but edit the commit message
# e, edit = use commit, but stop for amending
# s, squash = use commit, but meld into previous commit
# f, fixup = like "squash", but discard this commit's log message
# x, exec = run command (the rest of the line) using shell