From: Renato Botelho <garga@FreeBSD.org>
To: git@vger.kernel.org
Subject: --no-edit not respected after conflict
Date: Fri, 19 Mar 2021 11:44:30 -0300 [thread overview]
Message-ID: <4442fd0a-3306-a22b-3614-e3272f8f0be5@FreeBSD.org> (raw)
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.
--
Renato Botelho
next reply other threads:[~2021-03-19 14:45 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-19 14:44 Renato Botelho [this message]
2021-03-19 21:30 ` --no-edit not respected after conflict brian m. carlson
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4442fd0a-3306-a22b-3614-e3272f8f0be5@FreeBSD.org \
--to=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.
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 NNTP newsgroup(s).