From: "brian m. carlson" <sandals@crustytoothpaste.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] rerere: enable by default
Date: Mon, 7 Jun 2021 00:56:25 +0000 [thread overview]
Message-ID: <YL1uudVxwcDUg2+T@camp.crustytoothpaste.net> (raw)
In-Reply-To: <xmqqfsxvxjj2.fsf@gitster.g>
[-- Attachment #1: Type: text/plain, Size: 823 bytes --]
On 2021-06-06 at 12:30:25, 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.
Yes, I think this makes sense. I've been using it for quite a while
without problems and I'm usually quite good at breaking things, and if
we can make the user experience better, which I think rerere does,
that's definitely a good thing.
--
brian m. carlson (he/him or they/them)
Houston, Texas, US
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 262 bytes --]
next prev parent reply other threads:[~2021-06-07 0:57 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 [this message]
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
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=YL1uudVxwcDUg2+T@camp.crustytoothpaste.net \
--to=sandals@crustytoothpaste.net \
--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 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 NNTP newsgroup(s).