Slide 117
Slide 117 text
Git 基礎
要望 多かったrebaseについて
rebaseでできること そ 2
● 複数 コミットを1つにまとめる例
119
1 pick 2ff810a 2st commit
2 squash 80e4e22 3rd commit
3 squash 6bb05cb 4th commit
4
5 # Rebase 17c2008..6bb05cb onto 17c2008 (3 commands)
6 #
7 # Commands:
8 # p, pick = use commit
9 # r, reword = use commit, but edit the commit message
10 # e, edit = use commit, but stop for amending
11 # s, squash = use commit, but meld into previous commit
12 # f, fixup = like "squash", but discard this commit's log message
13 # x, exec = run command (the rest of the line) using shell
14 # b, break = stop here (continue rebase later with 'git rebase --continue')
15 # d, drop = remove commit
16 # l, label = label current HEAD with a name
17 # t, reset = reset HEAD to a label
3rd, 4th が 2st に吸収される