git rebase merges the commits in the middle

1. Prepare the data, submit one row at a time Insert picture description here
2. rebase
Insert picture description here

3. It is
fixupalso possible to merge version3 into version2, but the submission information cannot be modified

pick:保留该commit(缩写:p)
reword:保留该commit,但我需要修改该commit的注释(缩写:r)
edit:保留该commit, 但我要停下来修改该提交(不仅仅修改注释)(缩写:e)
squash:将该commit和前一个commit合并(缩写:s)
fixup:将该commit和前一个commit合并,但我不要保留该提交的注释信息(缩写:f)
exec:执行shell命令(缩写:x)
drop:我要丢弃该commit(缩写:d)

Insert picture description here

Insert picture description here
4. Results The
content was merged
Insert picture description here

Guess you like

Origin blog.csdn.net/claroja/article/details/114954328