Reorder Git Commits with Rebase
One of the greatest feature of
git rebase -i is recordering git commits. Be careful, you’d better do this before pushing these commits to remote, otherwise, it will make the merge non fast-forwardable and cause unexpected conflicts with other developers. Ok, now let’s see how to use it with an example.
Supposing we have the following commits:
* 0d70c6e (HEAD -> master) Migrate more articles from old blogs.
Let’s start by using
git rebase -i HEAD~3, your editor will pop open with some text similar like this:
pick 4146959 Add about page.
Recordering is as simple as moving the
pick commands around. For example, if you want to switch the commit
0d70c6e, simply switch the first line and the tird line.
pick 0d70c6e Migrate more articles from old blogs.
Save the file and exit, if everything goes well you would see the commit log as below. Magic, right? One thing you should keep in mind, it can not guarantee that every rebase will work without manual modification. Sometimes it will get messed up if some of the commits touched the same file. If this gets too messy to take care of, just do a git rebase –abort and you’ll be back where you started.
* 4146959 (HEAD -> master) Add about page.