From: Felipe Contreras <felipe.contreras@gmail.com>
To: "Đoàn Trần Công Danh" <congdanhqx@gmail.com>,
"Felipe Contreras" <felipe.contreras@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: The git spring cleanup challenge
Date: Tue, 01 Jun 2021 07:21:57 -0500 [thread overview]
Message-ID: <60b62665df1de_e40952080@natae.notmuch> (raw)
In-Reply-To: <YLYcnwZQAEoSQKsG@danh.dev>
Đoàn Trần Công Danh wrote:
> On 2021-06-01 05:48:41-0500, Felipe Contreras <felipe.contreras@gmail.com> wrote:
> > Đoàn Trần Công Danh wrote:
> > > Something is essential when working on constantly integration tree,
> > > I don't want to make my life hard:
> > >
> > > * rerere.enabled = true
> > > * rerere.autoupdate = true
> >
> > If the defaults make your life hard, then shouldn't we change the
> > defaults?
> >
> > For starters, which is the command you use? `git merge`? If so, maybe
> > `git merge` should have a --rerere option to enable rerere. There are
> > some --rerere-autoupdate, but no --rerere.
>
> I think both pull, merge, rebase, cherry-pick, revert, checkout,
> switch, apply, am will be affected by rerere.
Yes, I know, but I am talking about you personally. Where do you
absolutely need --rerere?
> > But fine, this is an exception too. The location of programs is not
> > something that can be changed by default.
> >
> > > And I would like to try new shiny features:
> > >
> > > * feature.experimental = true
> >
> > Interesting. I didn't know that existed, and I advocated for a
> > similar configuration: core.mode [2].
> >
> > But if most newcomers can live without it, I'm sure you can too for a
> > bit.
>
> The point of trying new shiny features is dogfooding ourselves and
> report bugs early, if any.
Yes, and more developers should turn this flag on, but it's not
*essential*, so you can live one month with it off. Either way I don't
think it matters for the purpose of this experiment if you have it or
not.
> > > > 3. Every day you can add 1 additional configuration (and update it the
> > > > next day).
> > > > 4. The moment you add a 4th configuration you lose.
> > >
> > > So, my baseline already requires 8 key-value pairs (ignoring alias and
> > > pull.rebase). I'm lost already.
> >
> > With the exceptions I think you only need these:
> >
> > * rerere.enabled = true
> > * rerere.autoupdate = true
>
> OK, let's start there.
Excellent.
--
Felipe Contreras
next prev parent reply other threads:[~2021-06-01 12:22 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 [this message]
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
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=60b62665df1de_e40952080@natae.notmuch \
--to=felipe.contreras@gmail.com \
--cc=congdanhqx@gmail.com \
--cc=git@vger.kernel.org \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).