From mboxrd@z Thu Jan 1 00:00:00 1970 From: Patrick McHardy Subject: Re: [PATCH 5/4] Use bools for xt_match Date: Mon, 04 Jun 2007 17:43:19 +0200 Message-ID: <46643317.1070204@trash.net> References: <46643007.7040902@trash.net> <466430D9.70006@trash.net> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Cc: Netfilter Developer Mailing List To: Jan Engelhardt Return-path: In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: netfilter-devel-bounces@lists.netfilter.org Errors-To: netfilter-devel-bounces@lists.netfilter.org List-Id: netfilter-devel.vger.kernel.org Jan Engelhardt wrote: > On Jun 4 2007 17:33, Patrick McHardy wrote: > >>>>Folded into 2/4, thanks. If you have more corrections please include >>>>which patch they belong to. >>> >>>If you use an SCM (rather than floating patches), then folding is impossible >>>is not it? (Unless you use extra SCM trickery like "git reset".) >> >>stgit. Saves huge amounts of time when trying to keep a clean history. > > > But that only works until merge, does not it? (I for my part use > quilt on top of git (tracking only), I tell ya, that's fun ;-) Of course. But once I've merged a tree I throw it away. (Actually you can uncommit patches that don't originate in your tree, but it of course can't change patches in Linus' tree :))