All of lore.kernel.org
 help / color / mirror / Atom feed
From: Felipe Contreras <felipe.contreras@gmail.com>
To: Elijah Newren <newren@gmail.com>,
	Felipe Contreras <felipe.contreras@gmail.com>
Cc: Sergey Organov <sorganov@gmail.com>,
	Git Mailing List <git@vger.kernel.org>
Subject: Re: The git spring cleanup challenge
Date: Thu, 03 Jun 2021 04:52:26 -0500	[thread overview]
Message-ID: <60b8a659f3ff2_1a0a2d2089c@natae.notmuch> (raw)
In-Reply-To: <CABPp-BEwueg9V0PHUZ=ZUrTRpqwqN2b2b3t4owkizr75a+BDUA@mail.gmail.com>

Elijah Newren wrote:
> On Wed, Jun 2, 2021 at 6:36 PM Felipe Contreras
> <felipe.contreras@gmail.com> wrote:
> >
> > Elijah Newren wrote:
> > > On Tue, Jun 1, 2021 at 3:39 PM Sergey Organov <sorganov@gmail.com> wrote:
> >
> > > > [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.

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

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

  reply	other threads:[~2021-06-03  9:53 UTC|newest]

Thread overview: 55+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-01  6:24 The git spring cleanup challenge Felipe Contreras
2021-06-01  7:28 ` Andy
2021-06-01 10:07   ` Felipe Contreras
2021-06-01  7:47 ` Đoàn Trần Công Danh
2021-06-01 10:48   ` Felipe Contreras
2021-06-01 11:40     ` Đoàn Trần Công Danh
2021-06-01 12:21       ` Felipe Contreras
2021-06-01 12:28         ` Đoàn Trần Công Danh
2021-06-01 13:14           ` Felipe Contreras
2021-06-02  4:13     ` Đoàn Trần Công Danh
2021-06-02  4:53       ` Felipe Contreras
2021-06-03  8:03         ` Ævar Arnfjörð Bjarmason
2021-06-03 10:06           ` Felipe Contreras
2021-06-03 10:49             ` Sergey Organov
2021-06-03 12:18             ` Ævar Arnfjörð Bjarmason
2021-07-02 10:12               ` Felipe Contreras
2021-07-02 11:43                 ` Ævar Arnfjörð Bjarmason
2021-07-02 21:54                   ` Felipe Contreras
2021-06-01 21:56 ` David Aguilar
2021-06-01 22:28   ` Junio C Hamano
2021-06-01 22:49     ` Junio C Hamano
2021-06-01 23:44       ` Felipe Contreras
2021-06-02  6:47         ` Johannes Sixt
2021-06-02  6:53           ` Felipe Contreras
2021-06-02 11:00           ` Junio C Hamano
2021-06-02 11:24             ` Felipe Contreras
2021-06-02 11:44             ` Đoàn Trần Công Danh
2021-06-02 18:13               ` Johannes Sixt
2021-06-01 23:12     ` Felipe Contreras
2021-06-02 12:13       ` Sergey Organov
2021-06-03  3:00         ` Junio C Hamano
2021-06-03 10:00           ` Sergey Organov
2021-06-01 22:33 ` Sergey Organov
2021-06-01 23:19   ` Felipe Contreras
2021-06-02 12:19     ` Sergey Organov
2021-06-02 21:28       ` Felipe Contreras
2021-06-02 22:05         ` Sergey Organov
2021-06-02 22:33           ` Felipe Contreras
2021-06-02 23:09             ` Sergey Organov
2021-06-03  0:06       ` Junio C Hamano
2021-06-03  0:48         ` Felipe Contreras
2021-06-03  0:26   ` Elijah Newren
2021-06-03  1:36     ` Felipe Contreras
2021-06-03  4:25       ` Elijah Newren
2021-06-03  9:52         ` Felipe Contreras [this message]
2021-06-03  9:48     ` Sergey Organov
2021-06-02  3:43 ` Bagas Sanjaya
2021-06-02  3:59   ` Felipe Contreras
2021-06-03  8:15 ` Ævar Arnfjörð Bjarmason
2021-06-03 11:09   ` Felipe Contreras
2021-06-03 12:31     ` Ævar Arnfjörð Bjarmason
2021-06-03 14:28       ` Phillip Wood
2021-06-03 16:44         ` Ævar Arnfjörð Bjarmason
2021-06-04 10:24           ` Phillip Wood
2021-06-03 17:28       ` Felipe Contreras

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=60b8a659f3ff2_1a0a2d2089c@natae.notmuch \
    --to=felipe.contreras@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=newren@gmail.com \
    --cc=sorganov@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.