From: Elijah Newren <newren@gmail.com>
To: Tao Klerks <tao@klerks.biz>
Cc: Tao Klerks via GitGitGadget <gitgitgadget@gmail.com>,
git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH] RFC: switch: allow same-commit switch during merge if conflicts resolved
Date: Sat, 6 May 2023 19:57:25 -0700 [thread overview]
Message-ID: <CABPp-BGtRF68YJaN+nQ6bCqeh4R-dC9a6mBZvAFkX9YbkFR3sQ@mail.gmail.com> (raw)
In-Reply-To: <CAPMMpoi7+rdQzQPyVB8T9Pb+f332c68QvWLkwBdJZw=BcP0jbQ@mail.gmail.com>
On Thu, May 4, 2023 at 10:06 PM Tao Klerks <tao@klerks.biz> wrote:
>
[...]
> ASIDE: I realized today that the warnings in
> die_if_some_operation_in_progress() suggest "--quit" (potentially
> leaving a conflicted index) and do not mention "--abort". Is there any
> objection to beefing up these messages a bit to offer both options?
Honestly, I'd prefer to just change them to --abort.
--quit is for very unusual expert situations (I did the operation,
forgot I was in the middle, did all kinds of funny resets and tweaks
and who-knows-what, and then later discovered there was an in-progress
operation I had forgotten, but I decided I liked my totally munged
state better and want to keep it while somehow marking the operation
as over.[1]) I think recommending it to users is a bit of a
disservice. If someone feels strongly about keeping it, I'd argue for
having both --abort and --quit, with --abort more prominent.
But my first vote would be for changing these to mention --abort. And
adding some scary warnings to the places where --quit is documented,
to recommend users consider --abort instead.
[1] That might sound like an exaggeration, but I think that's exactly
how it was advertised originally: 9512177b682 ("rebase: add --quit to
cleanup rebase, leave everything else untouched", 2016-11-12)
next prev parent reply other threads:[~2023-05-07 2:57 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-02 6:27 [PATCH] RFC: switch: allow same-commit switch during merge if conflicts resolved Tao Klerks via GitGitGadget
2023-05-02 15:55 ` Elijah Newren
2023-05-02 16:50 ` Junio C Hamano
2023-05-03 0:34 ` Elijah Newren
2023-05-04 5:01 ` Tao Klerks
2023-05-05 5:06 ` Tao Klerks
2023-05-07 2:57 ` Elijah Newren [this message]
2023-05-07 2:48 ` Elijah Newren
2023-05-07 22:01 ` Felipe Contreras
2023-05-08 8:30 ` Tao Klerks
2023-05-08 16:13 ` Felipe Contreras
2023-05-08 16:58 ` Tao Klerks
2023-05-08 19:18 ` Junio C Hamano
2023-05-09 1:55 ` Felipe Contreras
2023-05-08 10:44 ` Tao Klerks
2023-05-11 7:06 ` Elijah Newren
2023-05-21 20:08 ` Tao Klerks
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=CABPp-BGtRF68YJaN+nQ6bCqeh4R-dC9a6mBZvAFkX9YbkFR3sQ@mail.gmail.com \
--to=newren@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.com \
--cc=tao@klerks.biz \
/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 read-only IMAP folder(s) and NNTP newsgroup(s).