Re: The git spring cleanup challenge

From: Sergey Organov <sorganov@gmail.com>
Date: Jun 1, 2021, 22:33 UTC
Message-ID: <87wnrd6wqj.fsf@osv.gnss.ru>
In-Reply-To: <60b5d281552d6_e359f20828@natae.notmuch>

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

> Hello,
>

[...]

Show 7 quoted lines

> 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
[merge]
        conflictStyle = diff3

-- Sergey Organov

$ 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.