Re: The git spring cleanup challenge

Elijah Newren [off-list ref] writes:

On Tue, Jun 1, 2021 at 3:39 PM Sergey Organov [off-list ref] wrote:

quoted

Felipe Contreras [off-list ref] writes:

quoted

Hello,

[...]

quoted

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