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

help reverting a merge

From
JMJustin Mattock <justinmattock@gmail.com>
Date
Nov 29, 2009, 23:24 UTC
Message-ID
<dd18b0c30911291524q7ea7e9c7v980340ddf7269519@mail.gmail.com>

(I'm not on the list, so hopefully this goes through). I've done a bisect on a problem with the kernel, and am a bit confused on what to do. i.g. the results are showing this: a03fdb7612874834d6847107198712d18b5242c7 is the first bad commit

when trying to revert this commit I get this: git revert a03fdb7612874834d6847107198712d18b5242c7 fatal: Commit a03fdb7612874834d6847107198712d18b5242c7 is a merge but no -m option was given.

then doing this I get this:

git revert -m 1 a03fdb7612874834d6847107198712d18b5242c7 Automatic revert failed. After resolving the conflicts, mark the corrected paths with 'git add <paths>' or 'git rm <paths>' and commit the result.

how do I find out the commits in this merge to automatically revert to find the problem that's causing this bug?

-- 
Justin P. Mattock
Next: Jeff King
Message 1 of 4 in “help reverting a merge”
  1. Justin MattockNov 29, 2009
  2. Jeff KingNov 30, 2009
  3. Justin P. MattockNov 30, 2009
  4. Justin P. MattockDec 1, 2009

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.