Junio C Hamano wrote: > By default, the rerere machinery has been disabled since a bug in > the machinery could screw up the end user's data at the most > stressful time during the end user's workday (i.e. during conflict > resolution). > > It however has been in wide use without causing much trouble (other > than, obviously, replaying a broken conflict resolution that was > recorded earlier when the user made a mismerge), and it is about > time to enable it by default. That is a good diea. > Signed-off-by: Junio C Hamano <gitster@xxxxxxxxx> But did you really come up with it all by yourself? Could perhaps this mail [1] sent 5 days prior have anything to do with it? > If the defaults make your life hard, then shouldn't we change the > defaults? > But, if we are already on this topic... who wants rerere disabled by > default? Cheers. [1] https://lore.kernel.org/git/60b61089ba63d_e40ca20894@natae.notmuch/ -- Felipe Contreras
