在我做了git rebase后，它应该只有一个提交

Question

I followed the steps for git rebase... now when i do git status it shows. 我按照git rebase的步骤进行了...现在，当我执行git状态时，它会显示出来。
and then git log it shows two commits. 然后git log它显示两个提交。
after I did git rebase it should so only one commit right?? 在我做了git rebase之后它应该只有一个提交权吗？
if it should one commit I would have executed this comment **git push origin [swim-kick] -f ** 如果它应该一个提交我会执行此评论** git push origin [swim-kick] -f **
now how should I need to proceed?? 现在我该怎么办呢？

git log --oneline --graph --decorate=short --all 

* aaaa (HEAD -> swim-kick, origin/swim-kick) swim: width issue
* bbbb swim: functionError issue
*   cccc Merge branch 'swim-kick' of gitlab.usaa.com:country into swim-kick
|\
| * dddd swim: border for close
* | eeee swim: border for close
|/

Answer 1

It would be easier if you could show the commands that you executed. 如果您可以显示您执行的命令会更容易。 The steps you would follow: 您将遵循的步骤：

git rebase origin/master -i

pick the first commit, squash or fixup the the rest of the commits. 选择第一次提交，压缩或修复其余的提交。

If you followed the above steps, the other possibility could be that you if you branched out of branch A and not master, it shows the commits of branch A as well 如果你按照上面的步骤，另一种可能性是，如果你分支出分支A而不是主分支，它也会显示分支A的提交

在我做了git rebase后，它应该只有一个提交

问题描述

1 个解决方案

解决方案1
0 2017-05-08 00:45:42

在我做了git rebase后，它应该只有一个提交

问题描述

1 个解决方案

解决方案1 0 2017-05-08 00:45:42

解决方案1
0 2017-05-08 00:45:42