Re: The git spring cleanup challenge

Felipe Contreras [off-list ref] 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
[merge]
        conflictStyle = diff3

-- Sergey Organov

Sergey Organov wrote:

Felipe Contreras [off-list ref] writes:

quoted

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

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

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?

[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.)

Elijah Newren wrote:

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

quoted

[diff]
        algorithm = patience

Any reason for patience vs. histogram?

Is histogram better than default?

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.

[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`.

[log]
        mailmap = true

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

Cheers.

-- 
Felipe Contreras

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.

Elijah Newren wrote:

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

quoted

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

Interesting. I'll give it a try after this month.

quoted

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?

Because log is to list a log, and show is to show a single commit. --no-walk
makes sense in addition to --stdin for example.

A log with a single entry doesn't seem like a log to me. But to each his
own.

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.

I'm the opposite, in fact, I barely use git log. When I want to see
history I use gitk, and when I want to see a single commit `git show`.

 9% show
 7% v # alias for gitk
 2% log

quoted

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.

Ohhh, that makes sense.

-- 
Felipe Contreras