lists.openwall.net   lists  /  announce  owl-users  owl-dev  john-users  john-dev  passwdqc-users  yescrypt  popa3d-users  /  oss-security  kernel-hardening  musl  sabotage  tlsify  passwords  /  crypt-dev  xvendor  /  Bugtraq  Full-Disclosure  linux-kernel  linux-netdev  linux-ext4  linux-hardening  linux-cve-announce  PHC 
Open Source and information security mailing list archives
 
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <4829B32F.9060301@keyaccess.nl>
Date:	Tue, 13 May 2008 17:26:39 +0200
From:	Rene Herman <rene.herman@...access.nl>
To:	Ingo Molnar <mingo@...e.hu>
CC:	Takashi Iwai <tiwai@...e.de>, Glauber Costa <gcosta@...hat.com>,
	Thomas Gleixner <tglx@...utronix.de>,
	Pete Clements <clem@...m.clem-digital.net>,
	Linux Kernel <linux-kernel@...r.kernel.org>
Subject: Re: 2.6.26-rc1 regression: ISA DMA broken (bisected)

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@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Powered by blists - more mailing lists

Powered by Openwall GNU/*/Linux Powered by OpenVZ