From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IXBwq-0002KI-Np
	for qemu-devel@nongnu.org; Mon, 17 Sep 2007 04:27:16 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IXBwp-0002JT-6n
	for qemu-devel@nongnu.org; Mon, 17 Sep 2007 04:27:16 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IXBwp-0002JQ-2d
	for qemu-devel@nongnu.org; Mon, 17 Sep 2007 04:27:15 -0400
Received: from rv-out-0910.google.com ([209.85.198.184])
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <christian.michon@gmail.com>) id 1IXBwo-00041m-ON
	for qemu-devel@nongnu.org; Mon, 17 Sep 2007 04:27:14 -0400
Received: by rv-out-0910.google.com with SMTP id g11so4798021rvb
	for <qemu-devel@nongnu.org>; Mon, 17 Sep 2007 01:27:13 -0700 (PDT)
Message-ID: <46d6db660709170127t415b3a06vbef6c5dd19cd172f@mail.gmail.com>
Date: Mon, 17 Sep 2007 10:27:13 +0200
From: "Christian MICHON" <christian.michon@gmail.com>
Subject: Re: [Qemu-devel] qemu Changelog Makefile Makefile.target TODO ae...
In-Reply-To: <1190016521.14938.148.camel@rapid>
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
References: <E1IX1La-0003Cw-GO@cvs.savannah.gnu.org>
	<1190016521.14938.148.camel@rapid>
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

On 9/17/07, J. Mayer <l_indien@magic.fr> wrote:
> > Log message:
> >       find -type f | xargs sed -i 's/[\t ]$//g' # on most files
>
> Many thanks for generating hundreds of conflicts with a useless commit.
> Don't know what's wrong in your expression but it did not what you think
> it should (and you did not even check....).
>
> DON'T DO THIS KIND OF COMMIT AGAIN, PLEASE.
>

if we were using git (but you can do it locally anyway), you would not
have these conflicts problems...

git-apply indead has this feature about ignoring useless whitespaces...

-- 
Christian
--
http://detaolb.sourceforge.net/, a linux distribution for Qemu with Git inside !