Subject: Re: The git spring cleanup challenge

From: Sergey Organov <[email-masked]>
Date: Thu, 03 Jun 2021 12:48:40 +0300

Elijah Newren <[email-masked]> writes:

> On Tue, Jun 1, 2021 at 3:39 PM Sergey Organov <[email-masked]> wrote:
>>
>> Felipe Contreras <[email-masked]> writes:
>>
>> > Hello,
>> >
>>
>> [...]
>>
>> > These are the configurations I've chosen:
>> >
>> >   [merge]
>> >     conflictstyle = diff3
>> >   [sendemail]
>> >     smtpserver = /usr/bin/msmtp
>> >
>>
>> [pull]
>>         rebase = merges
>> [push]
>>         default = simple
>> [rerere]
>>         enabled = true
>>         autoupdate = true
>> [diff]
>>         algorithm = patience
>
> Any reason for patience vs. histogram?

No, I only tried the 'patience', didn't try 'histogram'.

-- Sergey Organov