Re: The git spring cleanup challenge

On Wed, Jun 2, 2021 at 6:36 PM Felipe Contreras
[off-list ref] wrote:

Elijah Newren wrote:

quoted

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

quoted

quoted

[diff]
        algorithm = patience

Any reason for patience vs. histogram?

Is histogram better than default?

Yes, definitely.  I think diff.algorithm should default to histogram,
personally.

See also commits 85551232b56e (perf: compare diff algorithms,
2012-03-06) and c8017176ac8f (merge-ort: use histogram diff,
2020-12-13).

quoted

quoted

[merge]
        conflictStyle = diff3

Anyway, here's my list to join in on the fun...

[branch]
        sort = authordate

Nice. I didn't know that existed.

I have `tag.sort = -version:refname`, and after a few days without I'm
wondering why it isn't the default.

quoted

[alias]
        brief = !git log --no-walk --abbrev=12 --pretty=reference

I find it odd that you prefer `git log --no-walk` over
`git show --quiet`.

Why?  Both log and show require an extra flag, so why should the
choice matter or be surprising?

I happen to use log a lot more than show, so I think in terms of
adding flags to git log rather than the ones I need to add to git
show.  Not a big deal either way, though.

quoted

[log]
        mailmap = true

Another one that I don't see why it isn't the default.

It is the default and has been for a couple years; see f3eda90ffc10
(log: really flip the --mailmap default, 2019-08-01).  I just never
cleaned up my config.