help reverting a merge

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



(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
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]