How can I merge two commits into one?
I am trying to merge 2 commits into 1, so I followed “squashing commits with rebase” from git ready.
I ran
git rebase --interactive HEAD~2
In the resulting editor, I change pick to squash and then save-quit, but the rebase fails with the error
Cannot 'squash' without a previous commit
Now that my work tree has reached this state, I'm having trouble recovering. The command git rebase --interactive HEAD~2 fails with
Interactive rebase already started
and git rebase --continue fails with
Cannot 'squash' without a previous commit
Get back to where you started with
$ git rebase --abort
Say your history is
$ git log --pretty=oneline
a931ac7c808e2471b22b5bd20f0cad046b1c5d0d c
b76d157d507e819d7511132bdb5a80dd421d854f b
df239176e1a2ffac927d8b496ea00d5488481db5 a
That is, a was the first commit, then b, and finally c. After committing c we decide to squash b and c together:
Running git rebase --interactive HEAD~2 gives you an editor with
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.
#
Changing b's pick to squash will result in the error you saw, but if instead you squash c into b (newer into the older) by changing the text to
pick b76d157 b
squash a931ac7 c
and save-quitting your editor, you'll get another editor whose contents are
# This is a combination of 2 commits.
# The first commit's message is:
b
# This is the 2nd commit message:
c
When you save and quit, the contents of the edited file become commit message of the new combined commit:
$ git log --pretty=oneline
18fd73d3ce748f2a58d1b566c03dd9dafe0b6b4f b and c
df239176e1a2ffac927d8b496ea00d5488481db5 a
If there are multiple commits, you can use git rebase -i to squash two commits into one.
If there are only two commits you want to merge, and they are the "most recent two", the following commands can be used to combine the two commits into one:
git reset --soft "HEAD^"
git commit --amend
First you should check how many commits you have:
git log
There are two status:
One is that there are only two commits:
For example:
commit A
commit B
(In this case, you can't use git rebase to do) you need to do following.
$ git reset --soft HEAD^1
$ git commit --amend
Another is that there are more than two commits; you want to merge commit C and D.
For example:
commit A
commit B
commit C
commit D
(under this condition, you can use git rebase)
git rebase -i B
And than use "squash" to do. The rest thins is very easy. If you still don't know, please read http://zerodie.github.io/blog/2012/01/19/git-rebase-i/
链接地址: http://www.djcxy.com/p/550.html下一篇: 我怎样才能将两个提交合并成一个？