错误：如果没有先前的提交就无法“挤压”您可以使用“git rebase --edit-todo”修复此问题，然后运行“git rebase --continue”

Question

I have a below commits in bitbucket,i wanted to squash all the commits in to one commits.

When i do git rebase -i HEAD~5 ,it is showing all the commits in reverse order on git bash,where the last commit ie is Commit 5 is listed last.

pick 104e52ffdb IA-31774 Commit 1
pick 157be0f3b3 IA-31774 Commit 2
pick 4619cf38be IA-31774 Commit 3
pick e89937fca9 IA-31774 Commit 4
pick 38c54ea317 IA-31774 Commit 5

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

I tried below options.

s 104e52ffdb IA-31774 Commit 1
s 157be0f3b3 IA-31774 Commit 2
s 4619cf38be IA-31774 Commit 3
p e89937fca9 IA-31774 Commit 4
r 38c54ea317 IA-31774 Commit 5

I tried the above option,i got the below error.

error: cannot 'squash' without a previous commit You can fix this with 'git rebase --edit-todo' and then run 'git rebase --continue'. Or you can abort the rebase with 'git rebase --abort'.

Can any one plese help me how to squash all the 5 commits in to single commits,also let me know the steps to be followed for squashing all the 5 commits in to single commit.

Thanks in Advance.

Answer 1

Normally, lines are executed in order up to down.

In order to squash everything this should work:

r 104e52ffdb IA-31774 Commit 1
s 157be0f3b3 IA-31774 Commit 2
s 4619cf38be IA-31774 Commit 3
s e89937fca9 IA-31774 Commit 4
s 38c54ea317 IA-31774 Commit 5

You reword and keep the first commit and squash all other. And if you want to delete messages of all your commits after commit 1, you should use f for fixup instead of squash..