# Rebase 4195fd7..670239a onto 4195fd7 (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 <commit> = like "squash", but discard this commit's log message # 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. # # These lines can be re-ordered; they are executed from top to bottom. # # If you remove a line here THAT COMMIT WILL BE LOST. # # However, if you remove everything, the rebase will be aborted.
# This is a combination of 2 commits. # This is the 1st commit message:
test 1
# This is the commit message #2:
test 2
# Please enter the commit message for your changes. Lines starting # with '#' will be ignored, and an empty message aborts the commit. # # Date: Fri Sep 18 14:27:13 2020 +0800 # # interactive rebase in progress; onto 4195fd7 # Last commands done (2 commands done): # pick e0b28b9 test 1 # squash 670239a test 2 # No commands remaining. # You are currently rebasing branch 'master' on '4195fd7'. # # Changes to be committed: # new file: demo.txt #
