38. 衍合(变基)分支
# 假如想修改最近三个的 commit
git rebase -i HEAD~3
# 回滚到某个特性的 commit
pick f7f3f6d changed my name a bit
edit 310154e updated README formatting and added blame
pick a5f4a0d added cat-file
# Rebase 710f0f8..a5f4a0d onto 710f0f8
#
# Commands:
# p, pick = use commit
# e, edit = use commit, but stop for amending
# s, squash = use commit, but meld into previous commit
#
# If you remove a line here THAT COMMIT WILL BE LOST.
# However, if you remove everything, the rebase will be aborted.
# 对于 edit 的 commit 进⾏行任意操作
# 修改完毕(git commit)之后没问题了继续衍合当前 commit
git rebase --continue
# 如果当前 edit 不需要编辑了可以跳过
git rebase --skip
39.
40. 标签
# 查看当前所有标签
git tag
# 标记当前分⽀支为 v1.0 版本作为归档
git tag -a v1.0
# 添加带备注的标签
git tag -a v1.2.1225 -m ‘圣诞节特别版本’
# 把历史特定 commit 标记标签
git tag -a v1.1 1d2x33
# 查找 v1.0 版本下有多少标记的⼩小版本
git tag -l ‘v1.*’
# 分享标签
git push origin v1.0