Re: [PATCH 1/3] Prepare for non-interactive merge-preserving rebase

Stephen Haberman wrote:

quoted

Stephen, I had to modify the tests a bit to get them to work with how
I implemented the merge-preserving rebase, and also to remove a lot of
the cruft that was previously in there. Hope you're ok with the
attribution in the commit message.

No problem, it looks great.

This is awesome. Thanks for the insanely short turnaround.

It requires a bit of testing though. All the t/t34* tests pass with
all the patches applied, and some manual tries worked just fine too,
but if you wanna give it a twirl where you work, that'd be great.

The
GIT_EDITOR=: hack is neat. I did not think it would be that simple.

Actually, you should be able to use vanilla "git-rebase -i -p" without
getting an editor by doing something like this:

GIT_EDITOR=: git rebase -i -p

but recommending a hack like that to work around a UI deficiency didn't
really appeal to me. If Junio doesn't like the patches though, you could
try using that.

-- 
Andreas Ericsson                   andreas.ericsson@op5.se
OP5 AB                             www.op5.se
Tel: +46 8-230225                  Fax: +46 8-230231