From: Johannes Schindelin Date: Fri, 17 Jul 2009 18:32:20 GMT Subject: Re: [PATCH] Fix rebase -p --onto Message-ID: In-Reply-To: <20090717164845.GL7878@vinegar-pot.mit.edu> Hi, On Fri, 17 Jul 2009, Greg Price wrote: > On Fri, Jul 17, 2009 at 10:40:08AM +0200, Johannes Sixt wrote: > > I have used rebase -i -p in the past to rewrite history that involves > > merges of topic branches like this: > > > > ---------Y--M--M--F <-- master > > / / > > ----a--a--a / > > / > > --b--b--b--b > > > > where F is a fixup that I want to insert between Y and M, and I thought > > rebase -i -p was intended for this use-case. > > I don't believe rebase -i -p has ever worked with reordering commits. It was not meant to. Actually, it was never meant as "rebase -i -p", but always as "rebase -p" (which, for technical reasons, would be implemented in git-rebase--interactive.sh). Having said that, I am working on a rebase-i-p series which _does_ allow reordering commits, putting commits on newly-created topic branches, redoing merges explicitely. Unfortunately, I seem to have less and less time for Git (which is not helped by the frustrating experience of a first-slow then-failing GSoC project), and when I finally decided to set aside some time to polish the series and submit it, 1.6.4-rc0 came out. And I do not want Junio to be distracted from that very important (think push-to-current-branch) release. Ciao, Dscho