All of lore.kernel.org
 help / color / mirror / Atom feed
From: Harvey Harrison <harvey.harrison@gmail.com>
To: Len Brown <lenb@kernel.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
	Andi Kleen <andi@firstfloor.org>,
	Jesse Barnes <jbarnes@virtuousgeek.org>,
	"Rafael J. Wysocki" <rjw@sisk.pl>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	linux-acpi@vger.kernel.org
Subject: Re: Please pull ACPI updates
Date: Thu, 17 Jul 2008 12:12:11 -0700	[thread overview]
Message-ID: <1216321931.6029.1.camel@brick> (raw)
In-Reply-To: <alpine.LFD.1.10.0807171402110.2965@localhost.localdomain>

On Thu, 2008-07-17 at 14:49 -0400, Len Brown wrote:
> Andi, Jesse, Linus,
> 
> One thing I wish I had in git is a way to make this sequence easier...
> 
> Say I have a big topic branch with 30 patches in it.
> The 3rd patch turns out to have a bug in it, but the
> rest of the series is okay.  Today I invoke gitk on
> the branch and keep that open.
> Then I create a new topic branch at the broken patch.
> 
> I always consult ~/src/git/Documentation/git-reset.txt
> so I can remember the following sequence...
> 
> $ git reset --soft HEAD^
> $ edit
> $ git commit -a -c ORIG_HEAD
> 
> Now I've got the fixed 3rd patch checked in,
> but 27 patches in the original branch are hanging
> off the original broken 3rd patch.
> So I git-cherry-pick 27 patches
> I hope I get them in the right order and don't miss any...
> 
> It would be nice if we could somehow git rebase those
> 27 patches in a single command, but if we do,
> that pulls with it the broken 3rd patch.

git rebase --interactive

sounds like exactly what you are asking for.

Harvey


  reply	other threads:[~2008-07-17 19:12 UTC|newest]

Thread overview: 41+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-07-16 21:45 Please pull ACPI updates Andi Kleen
2008-07-16 22:11 ` Rafael J. Wysocki
2008-07-16 23:33   ` Jesse Barnes
2008-07-16 23:45     ` Linus Torvalds
2008-07-16 23:51       ` Jesse Barnes
2008-07-17  0:32         ` Linus Torvalds
2008-07-17  0:53           ` Linus Torvalds
2008-07-17  2:26             ` Jesse Barnes
2008-07-17  2:56               ` Linus Torvalds
2008-07-17  6:45           ` Andi Kleen
2008-07-17 15:06             ` Linus Torvalds
2008-07-17  6:40       ` Andi Kleen
2008-07-17 15:03         ` Linus Torvalds
2008-07-17 18:49           ` Len Brown
2008-07-17 19:12             ` Harvey Harrison [this message]
2008-07-17 19:50               ` Andi Kleen
2008-07-17 19:12             ` Linus Torvalds
2008-07-17 19:16               ` Linus Torvalds
2008-07-17 21:15             ` J. Bruce Fields
2008-07-17 23:11           ` [PATCH] Revert duplicate "dock: bay: Don't call acpi_walk_namespace() when ACPI is disabled" commit (was: Please pull ACPI updates) Thomas Gleixner
2008-07-17 23:25             ` [PATCH] Revert duplicate "dock: bay: Don't call acpi_walk_namespace() when ACPI is disabled" commit Andi Kleen
2008-07-18  0:07             ` [PATCH] Revert duplicate "ACPI: don't walk tables if ACPI was disabled" commit (was: Please pull ACPI updates) Thomas Gleixner
2008-07-17  6:47     ` Please pull ACPI updates Andi Kleen
2008-07-17 15:18       ` Linus Torvalds
2008-07-17 15:47         ` Linus Torvalds
2008-07-17 16:02           ` Linus Torvalds
2008-07-17 16:23           ` Andi Kleen
2008-07-17 19:11             ` Ray Lee
2008-07-17 19:49               ` Andi Kleen
2008-07-17 20:01                 ` Linus Torvalds
2008-07-17 20:14                   ` Andi Kleen
2008-07-17 20:16                   ` Linus Torvalds
2008-07-17 20:28                     ` Linus Torvalds
2008-07-18 13:25                       ` Olivier Galibert
2008-07-18 15:57                         ` Ray Lee
2008-07-18 15:57                           ` Ray Lee
2008-07-17 20:34                     ` Andi Kleen
2008-07-17 20:11                 ` Ray Lee
2008-07-17 20:29                   ` Andi Kleen
2008-07-18  6:39                     ` david
  -- strict thread matches above, loose matches on Subject: below --
2008-07-24 20:36 Andi Kleen

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=1216321931.6029.1.camel@brick \
    --to=harvey.harrison@gmail.com \
    --cc=andi@firstfloor.org \
    --cc=jbarnes@virtuousgeek.org \
    --cc=lenb@kernel.org \
    --cc=linux-acpi@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=rjw@sisk.pl \
    --cc=torvalds@linux-foundation.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.