【GitHub】リベース：複数のコミットを1つにまとめる方法！

$ git log --oneline
2a2b159 (HEAD -> develop) コメント3
33e347e コメント2
8100f18 コメント1

$ git rebase -i HEAD~2

pick 33e347e コメント2
pick 2a2b159 コメント3

# Rebase 8100f18..2a2b159 onto 8100f18 (2 commands)
#
# Commands:
# p, pick <commit> = use commit
# r, reword <commit> = use commit, but edit the commit message
# e, edit <commit> = use commit, but stop for amending
# s, squash <commit> = use commit, but meld into previous commit
# f, fixup [-C | -c] <commit> = like "squash" but keep only the previous
#                    commit's log message, unless -C is used, in which case
#                    keep only this commit's message; -c is same as -C but
#                    opens the editor
# x, exec <command> = run command (the rest of the line) using shell
# b, break = stop here (continue rebase later with 'git rebase --continue')
# d, drop <commit> = remove commit
# l, label <label> = label current HEAD with a name
# t, reset <label> = reset HEAD to a label
# m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]
#         create a merge commit using the original merge commit's
#         message (or the oneline, if no original merge commit was
#         specified); use -c <commit> to reword the commit message

$ git push -f origin master

pick 33e347e コメント2
squash 2a2b159 コメント3

# This is a combination of 2 commits.
# This is the 1st commit message:

コメント2

# This is the commit message #2:

コメント3

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
#
# Date:      Fri Jan 19 19:50:22 2024 +0900
#
# interactive rebase in progress; onto 8100f18
# Last commands done (2 commands done):
#    pick 33e347e コメント2
#    squash 2a2b159 コメント3
# No commands remaining.
# You are currently rebasing branch 'develop' on '8100f18'.
#
# Changes to be committed:

$ git log --oneline
c60310f (HEAD -> develop) コメント2
8100f18 コメント1

$ git push -f origin master
$ git push --force origin master