public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Valdis.Kletnieks@vt.edu
To: linux-kernel@vger.kernel.org
Subject: git bisect questions...
Date: Tue, 04 May 2010 10:23:54 -0400	[thread overview]
Message-ID: <6677.1272983034@localhost> (raw)

[-- Attachment #1: Type: text/plain, Size: 888 bytes --]

Trying to bisect my way through linux-next to track down a nasty DRM bug that
hoses the nouveau driver, and I have a few questions:

1) I look at 'git bisect visualize', and I see a nice merge point that I
am fairly sure will (a) bisect as good and (b) trim out a *lot* of ancestor
commits in one shot.  If I do a 'git reset --hard <merge commit>', will
that make the next 'git bisect' do what I want?

2) I'm down to the last 100 or so commits, and I have a at least 3 'git
bisect skip' in there already because of a (presumably) unrelated oops.
I'm pretty sure that commit 10fd883ce384706f88554a0b08cc4d63345e7d8b is
the fix - how do I logically move that commit to right after the commit
22dd82a3f5ceef72be19e502418823a2f8801ed0 which introduced the oops, so
I can bisect through the 70 or so commits in between?  I know it involves
"git cherrypick", but have no clue how to do it...


[-- Attachment #2: Type: application/pgp-signature, Size: 227 bytes --]

             reply	other threads:[~2010-05-04 14:23 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-05-04 14:23 Valdis.Kletnieks [this message]
2010-05-04 16:08 ` git bisect questions Frans Pop
2010-05-06 14:00   ` Valdis.Kletnieks

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=6677.1272983034@localhost \
    --to=valdis.kletnieks@vt.edu \
    --cc=linux-kernel@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