How to merge pushed two commits?

Question

I committed and pushed some files via git commit . followed by git push.

Then, I found that there were some mistakes in the files. I fixed ti. Then, I recommitted and re-pushed. So, I now see two separate commits in git log, which is ugly.

Can I merge these two pushed commits into one?

In the future, consider using git commit --amend, which amends the previous commit. Then push with git push --force which will overwrite the previous commit. @AdamT's advice on shared repositories still holds. — beatgammit
– beatgammit, Commented Mar 16, 2013 at 1:25

AdamT · Accepted Answer · 2013-03-16 01:21:37Z

Yes you can. If no one else has pulled from the remote you can:

git rebase -i

Followed by:

git push origin +master

Please keep in mind that it is not recommended to rebase shared repositores and that +master will ignore it being fast forward.

Collectives™ on Stack Overflow

How to merge pushed two commits?

1 Answer 1

Comments

Hot Network Questions

Collectives™ on Stack Overflow

1 Answer 1

Comments

Related