Re: The git spring cleanup challenge

From: Sergey Organov <sorganov@gmail.com>
Date: Jun 2, 2021, 12:19 UTC
Message-ID: <87eedktq4x.fsf@osv.gnss.ru>
In-Reply-To: <60b6c08f75c1c_40442086d@natae.notmuch>

Felipe Contreras <felipe.contreras@gmail.com> writes:

Show 15 quoted lines

> Sergey Organov wrote:
>> Felipe Contreras <felipe.contreras@gmail.com> writes:
>
>> > These are the configurations I've chosen:
>> >
>> >   [merge]
>> >     conflictstyle = diff3
>> >   [sendemail]
>> >     smtpserver = /usr/bin/msmtp
>> >
>> 
>> [pull]
>> 	rebase = merges
>
> Can you do `git pull --rebase=merges` for a while?

I never use 'git pull' for merging, and all the time with rebasing, so what's the point? I mean, whenever I do 'git pull' I mean 'git pull --rebase', and whenever I need to merge, I exclusively use'git merge'.

Show 5 quoted lines

>
>> [push]
>> 	default = simple
>
> This is the default, you don't need it.

Yep, a remnant from the past.

Show 11 quoted lines

>
>> [rerere]
>> 	enabled = true
>> 	autoupdate = true
>
> We are seeing a pattern here.
>
>> [diff]
>> 	algorithm = patience
>
> Does this make a lot of difference?

As far as I recall, I had some mismerges long time ago that this setting affected positively, so I've tweaked it.

Thanks, -- Sergey Organov