1つ前のコミットと現在のコミットを統合する

ターミナル

$ git rebase -i HEAD~2

pick 6e47024 gem 'websocket-rails'
-pick 85a6886 Fix typo
+fix 85a6886 Fix typo

# Rebase b00cd93..85a6886 onto b00cd93
#
# 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
#
# If you remove a line here THAT COMMIT WILL BE LOST.
# However, if you remove everything, the rebase will be aborted.