From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LynqA-0008GT-IX for qemu-devel@nongnu.org; Tue, 28 Apr 2009 09:59:18 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Lynq5-0008CY-9F for qemu-devel@nongnu.org; Tue, 28 Apr 2009 09:59:17 -0400 Received: from [199.232.76.173] (port=41237 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Lynq4-0008CG-T8 for qemu-devel@nongnu.org; Tue, 28 Apr 2009 09:59:12 -0400 Received: from mx2.redhat.com ([66.187.237.31]:34049) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Lynq4-0006Bg-8Z for qemu-devel@nongnu.org; Tue, 28 Apr 2009 09:59:12 -0400 Message-ID: <49F70B6A.8050809@redhat.com> Date: Tue, 28 Apr 2009 15:58:02 +0200 From: Kevin Wolf MIME-Version: 1.0 Subject: Re: [Qemu-devel] updating git tree References: <1340785513-BeMail@laptop> In-Reply-To: <1340785513-BeMail@laptop> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: =?UTF-8?B?RnJhbsOnb2lzIFJldm9s?= Cc: laurent.desnogues@gmail.com, Laurent Vivier , Christoph.Egger@amd.com, computers57@hotmail.com, qemu-devel@nongnu.org Fran=C3=A7ois Revol schrieb: >>> Ah, of course, and I don't have the disk space to upgrade from etch=20 >>> to=20 >>> lenny... >>> fun. >>> >>> I think I'll just send the diffs from the last svn and be done with=20 >>> it. >> you can use: >> >> git diff > tmp.patch >> patch -R -p1 < tmp.patch >> git pull >> patch -p1 < tmp.patch >=20 > Ok this seems to work at least for now, I've put it in a script like >=20 > #!/bin/sh > git diff > tmp.patch && patch -R -p1 < tmp.patch && git pull && patch - > p1 < tmp.patch && rm tmp.patch >=20 > Seems there is a git-revert, not sure how to use it anyway... > Oh well... git revert is for reverting commits. You can use git reset --hard instead of the patch -R though. Kevin