Re: [PATCH 4/4] git-rebase -i: New option to support rebase with merges

Hallo Johannes,

Johannes Schindelin schrieb am Mon 24. Mar, 14:08 (+0100):

On Mon, 24 Mar 2008, Jörg Sommer wrote:

quoted

Johannes Schindelin schrieb am Sun 23. Mar, 23:41 (+0100):

quoted

Now, that is funny.  In case of --preserve-merges, I would have 
expected you to touch pick_one_preserving_merges(), not pick_one().

I would find it highly illogical to try to redo merges _without_ -p.

Me too, but I think it's not possible to do what I want with -p.

But that is not a reason to mess up the source code.  If you do a thing as 
--linear-history (or --first-parents, as I would prefer it), that should 
be in the code path of --preserve-merges (and actually _imply_ that 
option).

Thanks for answering my question. You are really cooperatively.

Bye, Jörg.
-- 
IRC: Der [Prof. Andreas Pfitzmann, TU Dresden] hat gerade vorgeschlagen, sie
  sollen doch statt Trojanern die elektromagnetische Abstrahlung nutzen. Das
  sei nicht massenfähig, ginge ohne Eingriff ins System, sei zielgerichtet,
  und, der Hammer, das funktioniere ja bei Wahlcomputern schon sehr gut.