Re: Aborting git rebase --edit-todo

From: Victor Toni <victor.toni@gmail.com>
Date: Sep 3, 2020, 19:22 UTC
Message-ID: <CAG0OSgf9FsOpfOH+ErRTzMT333yDyZNthM8+7X3eRp=apRwJZg@mail.gmail.com>
In-Reply-To: <CAPUEspjKcQgLvVrJ2GroqYydNPksEziMgyceN-CFBFVgtngMuA@mail.gmail.com>

Show 11 quoted lines

> > 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
>

Didn't know about that one, will add it right away to my .gitconfig. Thanks.

Show 5 quoted lines

> 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
>

This sounds easier than it might be. On some machines I have (Git for) Windows and use a "regular" text editor which I guess I would have to kill to make it exit in a way to be recognized by git. Even when using Linux I never needed to make my editor exit with a non zero code. From a coding perspective this might work, from a usability perspective I really don't like it.

Victor