Git 常用命令小结

lb5645284

> git rebase -i HEAD~ # 交互式地重写 commit 信息，将会用终端默认的编辑器进行操作　　下面的例子中，保存之后，将会使得[328f67b Update Rust]这一条合并到[f55b189 Update cookbook]
　　pick 164bf1c Update cookbook
　　pick f55b189 Update cookbook
　　f 328f67b Update Rust
　　pick 9834843 Update cookbook
　　# Rebase 0b6762c..9834843 onto 0b6762c (4 commands)
　　#
　　# Commands:
　　# p, pick = use commit
　　# r, reword = use commit, but edit the commit message
　　# e, edit = use commit, but stop for amending
　　# s, squash = use commit, but meld into previous commit
　　# f, fixup = like "squash", but discard this commit's log message
　　# x, exec = run command (the rest of the line) using shell
　　# d, drop = remove commit
　　#
　　# 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.
　　#
　　# Note that empty commits are commented out