On Tue, Jun 1, 2021 at 3:39 PM Sergey Organov <sorganov@xxxxxxxxx> wrote:
>
> Felipe Contreras <felipe.contreras@xxxxxxxxx> writes:
>
> > Hello,
> >
>
> [...]
>
> > 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?
> [merge]
> conflictStyle = diff3
>
Anyway, here's my list to join in on the fun...
[branch]
sort = authordate
[alias]
brief = !git log --no-walk --abbrev=12 --pretty=reference
[log]
mailmap = true
[merge]
conflictStyle = diff3
directoryRenames = true
[protocol]
version = 2
[feature]
experimental = true
[pull]
twohead = ort
[diff]
renameLimit = 3000
(I have branch.sort=committerdate on another machine; not sure why I
was inconsistent, and yes now that I look at it I'm pretty sure two of
these have since become the default.)
