git如何合并 多个commit

需要先搞明白rebase
然后，进这个界面

pick b76d157 b
pick a931ac7 c

# Rebase df23917..a931ac7 onto df23917
#
# 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
#
# If you remove a line here THAT COMMIT WILL BE LOST.
# However, if you remove everything, the rebase will be aborted.
#

就把pick修改成squash就可以去掉这个commit，合并到其他commit中了

评论

1 楼 kinsamqiu 2013-07-18  

改成 s 也可以的