在Git中，如何重新排序（更改）推送提交？

Question

I have a repository with a single ( master ) branch:

a > b > e > f > g > c > d

It turns out that I need the changes in c and d (two commits toward the end of the history so far) to occur earlier, so that I'd have:

a > b > c > d > e > f > g

Everything's been pushed. I understand I'm not supposed to rebase pushed commits, so what can I do?

Answer 1

Here's a quick and dirty solution that doesn't change history:

1. Use git revert to remove each commit from the branch.
2. Use git cherry-pick to reapply the commits in the order which you want.

Push these changes. This lets you change the order of the commits without changing the history.

Answer 2

You cannot reorder pushed commits without git push -f . If this repository is shared between you and other guys, then you shouldn't do anything. If this is your own repo or it's on your own branch, use git rebase -i <hash of a> , then reorder the commits as you want, then git push -f .