From: Carlo Arenas <carenas@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Victor Toni <victor.toni@gmail.com>,
git@vger.kernel.org,
Johannes Schindelin <johannes.schindelin@gmx.de>
Subject: Re: Aborting git rebase --edit-todo
Date: Thu, 3 Sep 2020 11:55:04 -0700 [thread overview]
Message-ID: <CAPUEspjKcQgLvVrJ2GroqYydNPksEziMgyceN-CFBFVgtngMuA@mail.gmail.com> (raw)
In-Reply-To: <xmqqa6y6ah8h.fsf@gitster.c.googlers.com>
On Thu, Sep 3, 2020 at 10:47 AM Junio C Hamano <gitster@pobox.com> wrote:
> Now we have the "drop" verb, the latter interpretation becomes
> possible without making it impossible for the user to express the
> former.
and for people that would like to enforce the use of the drop verb
there is configuration that prevents deleted lines to "silently"
dropping commits since 5a5445d878 (rebase-interactive: warn if commit
is dropped with `rebase --edit-todo', 2020-01-28) :
rebase.missingCommitsCheck
AFAIK the correct "signal" to abort is to instruct your editor to exit
with non zero (ex: in vi using <esc>:cq), but agree it could be
confusing or "inconsistent" and might be worth adding it a message at
the footer
Carlo
next prev parent reply other threads:[~2020-09-03 18:55 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-03 9:39 Aborting git rebase --edit-todo Victor Toni
2020-09-03 17:43 ` Junio C Hamano
2020-09-03 18:55 ` Carlo Arenas [this message]
2020-09-03 19:22 ` Victor Toni
2020-09-03 20:02 ` Junio C Hamano
2020-09-03 19:32 ` Victor Toni
2020-09-03 19:59 ` Carlo Arenas
2020-09-03 21:07 ` Victor Toni
2020-09-03 21:08 ` Junio C Hamano
2020-09-03 21:21 ` Victor Toni
2020-09-04 5:43 ` Johannes Schindelin
2020-09-06 21:52 ` Junio C Hamano
2020-09-04 5:42 ` Johannes Schindelin
2020-09-04 5:32 ` Johannes Schindelin
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=CAPUEspjKcQgLvVrJ2GroqYydNPksEziMgyceN-CFBFVgtngMuA@mail.gmail.com \
--to=carenas@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=johannes.schindelin@gmx.de \
--cc=victor.toni@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.
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).