From: "brian m. carlson" <sandals@crustytoothpaste.net>
To: Renato Botelho <garga@freebsd.org>
Cc: git@vger.kernel.org
Subject: Re: --no-edit not respected after conflict
Date: Fri, 19 Mar 2021 21:30:33 +0000 [thread overview]
Message-ID: <YFUX+Rqdj3gteyql@camp.crustytoothpaste.net> (raw)
In-Reply-To: <4442fd0a-3306-a22b-3614-e3272f8f0be5@FreeBSD.org>
[-- Attachment #1: Type: text/plain, Size: 639 bytes --]
On 2021-03-19 at 14:44:30, Renato Botelho wrote:
> I was reverting multiple commits using --no-edit parameter and after one of
> those commits conflicted and I resolved using mergetool, no-edit option was
> not respected anymore and next commits opened editor for me to review commit
> message.
I'm not sure I understand what you're seeing here, and I think maybe if
I knew that I could provide more useful information. Could you maybe
provide the set of commands that you're running up to and when you see
this problem, or even better, a reproduction testcase?
--
brian m. carlson (he/him or they/them)
Houston, Texas, US
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 263 bytes --]
next prev parent reply other threads:[~2021-03-19 21:32 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-19 14:44 --no-edit not respected after conflict Renato Botelho
2021-03-19 21:30 ` brian m. carlson [this message]
2021-03-22 13:03 ` Renato Botelho
2021-03-22 17:14 ` Elijah Newren
2021-03-24 0:59 ` Elijah Newren
2021-03-24 1:27 ` Junio C Hamano
2021-03-26 7:19 ` Elijah Newren
2021-03-26 15:36 ` Renato Botelho
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=YFUX+Rqdj3gteyql@camp.crustytoothpaste.net \
--to=sandals@crustytoothpaste.net \
--cc=garga@freebsd.org \
--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.
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).