1. 程式人生 > >git 中間結果合併

git 中間結果合併

squash 6526149 feature:update pom.xml
squash cdfddea feature:update pom.xml-->clean annotations
squash 59eb5db feature:mv application.properties application.yml
squash f355153 feature:update application.yml
squash 5ed19de feature:update application.yml

# Rebase 06eb5a5..7e5adb8 onto 06eb5a5 (5 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