Re: The git spring cleanup challenge

From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Jun 2, 2021, 21:28 UTC
Message-ID: <60b7f7e03fc64_16925f208d4@natae.notmuch>
In-Reply-To: <87eedktq4x.fsf@osv.gnss.ru>

Sergey Organov wrote:

Show 21 quoted lines

> Felipe Contreras <felipe.contreras@gmail.com> writes:
> 
> > 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'.

So you can remove that configuration.

And afterwareds set pull.rebase=true so you don't need to specify --rebase.

Show 13 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.

Try running without it for a while. If you see issues then parhaps it's an indication that patience is a better default algorithm.

Cheers.

-- 
Felipe Contreras