From: Justin Mattock <justinmattock@gmail.com>
To: git@vger.kernel.org
Subject: help reverting a merge
Date: Sun, 29 Nov 2009 15:24:09 -0800 [thread overview]
Message-ID: <dd18b0c30911291524q7ea7e9c7v980340ddf7269519@mail.gmail.com> (raw)
(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 reply other threads:[~2009-11-29 23:24 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-11-29 23:24 Justin Mattock [this message]
2009-11-30 8:13 ` help reverting a merge Jeff King
2009-11-30 8:31 ` Justin P. Mattock
2009-12-01 0:06 ` Justin P. Mattock
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=dd18b0c30911291524q7ea7e9c7v980340ddf7269519@mail.gmail.com \
--to=justinmattock@gmail.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;
as well as URLs for NNTP newsgroup(s).