From: Vovodroid <qa23d-git@yahoo.com>
To: "git@vger.kernel.org" <git@vger.kernel.org>
Subject: No automatic continue of rebasing with rerere
Date: Sun, 26 Nov 2023 12:08:01 +0000 (UTC) [thread overview]
Message-ID: <511253473.8084883.1701000481697@mail.yahoo.com> (raw)
In-Reply-To: 511253473.8084883.1701000481697.ref@mail.yahoo.com
Hi,
when running non-interactive rebasing (i.e. no -i option) with rerere turned on, already resolved conflicts and recorded conflicts causing Git to return exit code 1, as if error occurred.
Also "git.exe rebase --continue" still opens log editor unless GIT_EDITOR environment variable is set to true.
Such behavior causes to user to perform a lot of unnecessary Git runs, or clicking if some GUI shell, like in GitExtension, is used.
See https://github.com/gitextensions/gitextensions/issues/11382 for discussion and screenshots.
Regards.
parent reply other threads:[~2023-11-26 12:08 UTC|newest]
Thread overview: expand[flat|nested] mbox.gz Atom feed
[parent not found: <511253473.8084883.1701000481697.ref@mail.yahoo.com>]
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=511253473.8084883.1701000481697@mail.yahoo.com \
--to=qa23d-git@yahoo.com \
--cc=git@vger.kernel.org \
/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