I remember having a similiar issue once that I think I used git rebase -p.
Unfortunately -p is incompatible with -i, but I think there's a way around
this that I don't remember right now.
On Thu, Oct 16, 2014 at 1:08 AM, Simon Peyton Jones
Friends
I have a branch, wip/new-flatten-skolems-Aug14, which has a long succession of work-in progress patches. Plus a couple of merges from HEAD.
I’d like to completely re-organise the patches before committing to HEAD. How do I do that? Some kind of rebase? Clearly I want to start from current HEAD, rather than having weird merge patches involved.
I was thinking of starting a new branch and doing a manual diff/patch, but that seems crude.
I think that one other person (Iavor) has pulled from this branch, but he has not modified it.
Thanks
Simon
_______________________________________________ ghc-devs mailing list ghc-devs@haskell.org http://www.haskell.org/mailman/listinfo/ghc-devs