Slide 138
Slide 138 text
!
git rebase -i HEAD~4
›
1 pick e8f500d Fix order of specs
2 pick 6017931 Styles tweaked
3 pick 63a108c Callback handler fixed
4 pick eb4f7b9 Rename main function
5
6 # Rebase 36ffb49..eb4f7b9 onto 36ffb49
7 #
8 # Commands:
9 # p, pick = use commit
10 # r, reword = use commit, but edit the commit message
11 # e, edit = use commit, but stop for amending
12 # s, squash = use commit, but meld into previous commit
1 pick e8f500d Fix order of specs
2 squash 6017931 Styles tweaked
3 pick 63a108c Callback handler fixed
4 squash eb4f7b9 Rename main function
5
6 # Rebase 36ffb49..eb4f7b9 onto 36ffb49
7 #
8 # Commands:
9 # p, pick = use commit
10 # r, reword = use commit, but edit the commit message
11 # e, edit = use commit, but stop for amending
12 # s, squash = use commit, but meld into previous commit
1 # This is a combination of 2 commits.
2 # The first commit's message is:
3
4 Fix order of specs
5
6 Update function
7
8 Styles tweaked
9
10 Rename main function
11
12 # This is the 2nd commit message:
[detached HEAD b442281] Rename package to Focused
7 files changed, 46 insertions(+), 46 deletions(-)
rewrite keymaps/zen.cson (60%)
Successfully rebased and updated refs/heads/master.