From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Lyn1D-0003Ty-Kw
	for qemu-devel@nongnu.org; Tue, 28 Apr 2009 09:06:39 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Lyn18-0003Rj-Rl
	for qemu-devel@nongnu.org; Tue, 28 Apr 2009 09:06:39 -0400
Received: from [199.232.76.173] (port=51239 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Lyn18-0003Rf-As
	for qemu-devel@nongnu.org; Tue, 28 Apr 2009 09:06:34 -0400
Received: from ecfrec.frec.bull.fr ([129.183.4.8]:34553)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <Laurent.Vivier@bull.net>) id 1Lyn17-00081f-PF
	for qemu-devel@nongnu.org; Tue, 28 Apr 2009 09:06:33 -0400
Subject: Re: [Qemu-devel] updating git tree
From: Laurent Vivier <Laurent.Vivier@bull.net>
In-Reply-To: <358165079-BeMail@laptop>
References: <358165079-BeMail@laptop>
Content-Type: text/plain; charset=utf-8
Date: Tue, 28 Apr 2009 15:10:05 +0200
Message-Id: <1240924206.4655.9.camel@frecb07144>
Mime-Version: 1.0
Content-Transfer-Encoding: quoted-printable
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: =?ISO-8859-1?Q?Fran=E7ois?= Revol <revol@free.fr>
Cc: Laurent Desnogues <laurent.desnogues@gmail.com>, Christoph.Egger@amd.com, computers57@hotmail.com, qemu-devel@nongnu.org

Le mardi 28 avril 2009 =C3=A0 14:57 +0200, Fran=C3=A7ois Revol a =C3=A9cr=
it :
> > On Tue, Apr 28, 2009 at 1:11 PM, Fran=C3=A7ois Revol <revol@free.fr>=20
> > wrote:
> > [...]
> > >
> > > git: 'stash' is not a git-command
> > > ...
> > > is this deprecated or just in another package ?
> >=20
> > It was added in git v1.5.3.
>=20
> Ah, of course, and I don't have the disk space to upgrade from etch to=20
> lenny...
> fun.
>=20
> I think I'll just send the diffs from the last svn and be done with it.

you can use:

git diff > tmp.patch
patch -R -p1 < tmp.patch
git pull
patch -p1 < tmp.patch

Laurent
--=20
------------------ Laurent.Vivier@bull.net  ------------------
"Tout ce qui est impossible reste =C3=A0 accomplir"    Jules Verne
"Things are only impossible until they're not" Jean-Luc Picard