Re: The git spring cleanup challenge

From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Jun 1, 2021, 23:19 UTC
Message-ID: <60b6c08f75c1c_40442086d@natae.notmuch>
In-Reply-To: <87wnrd6wqj.fsf@osv.gnss.ru>

Sergey Organov wrote:

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

Show 10 quoted lines

> > 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?

> [push]
> 	default = simple

This is the default, you don't need it.

> [rerere]
> 	enabled = true
> 	autoupdate = true

We are seeing a pattern here.

> [diff]
> 	algorithm = patience

Does this make a lot of difference?

> [merge]
>         conflictStyle = diff3

Same here.

-- 
Felipe Contreras

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.