All of lore.kernel.org
 help / color / mirror / Atom feed
From: Paul Menzel <paulepanter@users.sourceforge.net>
To: grub-devel@gnu.org
Subject: Best practices for bisecting GRUB and cherry-picking?
Date: Thu, 06 Nov 2014 08:01:14 +0100	[thread overview]
Message-ID: <1415257274.6322.50.camel@users.sourceforge.net> (raw)

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

Dear GRUB folks,


trying to a bisect a regression of AHCI on the ASRock E350M1 with
coreboot and GRUB as firmware, `ChangeLog` poses a problem when
resetting to an older commit and then cherry-picking certain commits to
fix other problems. The problem is that of course conflicts are shown.

Do you know how to circumvent that to avoid manually resolving the
conflicts?


Thanks,

Paul

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 181 bytes --]

             reply	other threads:[~2014-11-06  7:01 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-11-06  7:01 Paul Menzel [this message]
2014-11-06 14:38 ` Best practices for bisecting GRUB and cherry-picking? Lennart Sorensen
2014-11-06 17:37   ` Jonathan McCune

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=1415257274.6322.50.camel@users.sourceforge.net \
    --to=paulepanter@users.sourceforge.net \
    --cc=grub-devel@gnu.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.