Re:Show HN: 'git inject' – amend commits other than HEAD
by __david__ on Friday June 12, 2015 @03:12PM
(#9707951)
Even cooler is the "exec" directive. I converted a darcs repo to git and then used rebase to separate the huge mass of commits in the dev repo into their own branches. It went something like this:
exec git branch new_master
exec git checkout -b branch-a
pick a
pick b
pick c
exec git checkout new_master
pick d
exec git checkout -b branch-b
pick e
exec git checkout new_master
exec git checkout -b branch-c
pick f
...
exec git checkout new_master
The only trick was that you're doing stuff behind rebase's back, so whatever branch you end the script on gets `git reset` to the last pick. So you have to remember to switch back to master or end on a dummy branch that you can delete. Also, since the branch you are rebasing is not changed until the end, you can't rely on its name (since at the start it's pointing to the current state of things, not the new state), so you have to create your own branch if you want to keep popping back and forth.It was a neat trick and when it was done all the commits were nicely sorted into feature branches, as if we'd been doing that all along.
In fact, you can add arbitrary commits to the list, not only re-order the existing ones!
I sometimes do this:
Then we edit the arbitrary-picks file so that it has the interactive rebase syntax: i.e. putting the word "pick" in front of every line. Then: In the editor, we delete the "noop" line and read in the arbitrary-picks: Wee, now we are picking all those commits into this branch, with the interactive rebase workflow.