git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: --no-edit not respected after conflict

From
brian m. carlson <sandals@crustytoothpaste.net>
Date
Mar 19, 2021, 21:30 UTC
Message-ID
<YFUX+Rqdj3gteyql@camp.crustytoothpaste.net>
In-Reply-To
<4442fd0a-3306-a22b-3614-e3272f8f0be5@FreeBSD.org>
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
Previous: Renato BotelhoNext: Renato Botelho
Message 2 of 8 in “--no-edit not respected after conflict”
  1. Renato BotelhoMar 19, 2021
  2. brian m. carlsonMar 19, 2021
  3. Renato BotelhoMar 22, 2021
  4. Elijah NewrenMar 22, 2021
  5. Elijah NewrenMar 24, 2021
  6. Junio C HamanoMar 24, 2021
  7. Elijah NewrenMar 26, 2021
  8. Renato BotelhoMar 26, 2021

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.