Re: 2.6.26-rc1 regression: ISA DMA broken (bisected)

From: Rene Herman
Date: Tue May 13 2008 - 11:25:34 EST


On 13-05-08 16:36, Ingo Molnar wrote:

generally we prefer append-only repositories for public trees.

But as long as you've not pushed it out to others yet, i.e. it's a purely local development tree, you can use two methods:

If it's just one commit in some devel branch that you want to put into a 'fixes' branch one you can use git-cherry-pick --edit to shuffle it over.

For more complex scenarios you can use git-rebase --interactive to rebase your commits and to edit them. Replace the command "pick" with "edit" to change/fix the commit message. "squash" can be used to fold fixes.

Many thanks. Had in fact failed to notice --edit and will definitely check out the interactive rebase. Sounds very useful.

Rene.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/