Hi,
Johannes Schindelin wrote:
Hi,
On Sat, 26 Jul 2008, Stephan Beyer wrote:
quoted
For git-rebase-i -p (preserving merges) merges should be
rewritten. For this, the sequencer instructions "mark", "merge"
and "reset" are used.
Ah, the ugliness returns.
Yet I have not seen a way that is as flexible and clean as using
mark/merge/reset and imho this is not ugly.
(I know the discussion of the Joerg Sommer patches that introduced mark,
merge and reset.)
Regards.
--
Stephan Beyer [off-list ref], PGP 0x6EDDD207FCC5040F