From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LylDe-0003Yl-0J
	for qemu-devel@nongnu.org; Tue, 28 Apr 2009 07:11:22 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LylDZ-0003Wq-50
	for qemu-devel@nongnu.org; Tue, 28 Apr 2009 07:11:21 -0400
Received: from [199.232.76.173] (port=36386 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LylDY-0003Wk-RJ
	for qemu-devel@nongnu.org; Tue, 28 Apr 2009 07:11:16 -0400
Received: from smtp1-g21.free.fr ([212.27.42.1]:40555)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <revol@free.fr>) id 1LylDY-0002bQ-6h
	for qemu-devel@nongnu.org; Tue, 28 Apr 2009 07:11:16 -0400
In-Reply-To: <200904281049.54617.Christoph.Egger@amd.com>
Subject: Re: [Qemu-devel] updating git tree
From: "=?utf-8?q?Fran=C3=A7ois?= Revol" <revol@free.fr>
Date: Tue, 28 Apr 2009 13:11:26 +0200 CEST
Message-Id: <3107904742-BeMail@laptop>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"
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: Christoph Egger <Christoph.Egger@amd.com>
Cc: laurent.desnogues@gmail.com, computers57@hotmail.com, qemu-devel@nongnu.org

> On Tuesday 28 April 2009 08:54:56 Laurent Desnogues wrote:
> > On Tue, Apr 28, 2009 at 8:50 AM, C.W. Betts <
> > computers57@hotmail.com> wrote:
> > > I'm feeling lazy and I don't want to look at all the e-mails. 
> > > =C2=A0How do you
> > > update your git tree=3F
> >
> > Once you've cloned it (aka checkout), you update your tree using 
> > git pull
> > (aka update).
> 
> Unlike 'svn update', a 'git pull' doesn't automatically merge local 
> changes.
> git fails instead. git is missing this 'automatic merge on pull' 
> feature.
> If you have local changes, you must do
> 
> git stash ; git pull ; git stash pop
> 

git: 'stash' is not a git-command
...
is this deprecated or just in another package =3F

Fran=C3=A7ois.