From: Felipe Contreras <felipe.contreras@gmail.com>
To: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: RE: [PATCH] rerere: enable by default
Date: Mon, 07 Jun 2021 11:41:36 -0500 [thread overview]
Message-ID: <60be4c4071b80_39c0a208ac@natae.notmuch> (raw)
In-Reply-To: <xmqqfsxvxjj2.fsf@gitster.g>
Junio C Hamano wrote:
> By default, the rerere machinery has been disabled since a bug in
> the machinery could screw up the end user's data at the most
> stressful time during the end user's workday (i.e. during conflict
> resolution).
>
> It however has been in wide use without causing much trouble (other
> than, obviously, replaying a broken conflict resolution that was
> recorded earlier when the user made a mismerge), and it is about
> time to enable it by default.
That is a good diea.
> Signed-off-by: Junio C Hamano <gitster@pobox.com>
But did you really come up with it all by yourself?
Could perhaps this mail [1] sent 5 days prior have anything to do with it?
> If the defaults make your life hard, then shouldn't we change the
> defaults?
> But, if we are already on this topic... who wants rerere disabled by
> default?
Cheers.
[1] https://lore.kernel.org/git/60b61089ba63d_e40ca20894@natae.notmuch/
--
Felipe Contreras
prev parent reply other threads:[~2021-06-07 16:42 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-06 12:30 [PATCH] rerere: enable by default Junio C Hamano
2021-06-07 0:56 ` brian m. carlson
2021-06-07 9:51 ` Junio C Hamano
2021-06-07 9:50 ` Ævar Arnfjörð Bjarmason
2021-06-07 11:05 ` Junio C Hamano
2021-06-07 12:56 ` Ævar Arnfjörð Bjarmason
2021-06-07 10:34 ` Andrei Rybak
2021-06-07 16:41 ` Felipe Contreras [this message]
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=60be4c4071b80_39c0a208ac@natae.notmuch \
--to=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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.