From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LyjUL-0002JK-KK
	for qemu-devel@nongnu.org; Tue, 28 Apr 2009 05:20:29 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LyjUG-0002HV-1n
	for qemu-devel@nongnu.org; Tue, 28 Apr 2009 05:20:28 -0400
Received: from [199.232.76.173] (port=56813 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LyjUF-0002HP-Oz
	for qemu-devel@nongnu.org; Tue, 28 Apr 2009 05:20:23 -0400
Received: from outbound-dub.frontbridge.com ([213.199.154.16]:55425
	helo=IE1EHSOBE002.bigfish.com)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_ARCFOUR_MD5:16)
	(Exim 4.60) (envelope-from <Christoph.Egger@amd.com>)
	id 1LyjUF-0004Lt-9v
	for qemu-devel@nongnu.org; Tue, 28 Apr 2009 05:20:23 -0400
From: Christoph Egger <Christoph.Egger@amd.com>
Subject: Re: [Qemu-devel] updating git tree
Date: Tue, 28 Apr 2009 10:49:54 +0200
References: <BAY110-DAV15DFE0635DCC2980E8842B96E0@phx.gbl>
	<761ea48b0904272354w3267b367hb62ee873b5e50a29@mail.gmail.com>
In-Reply-To: <761ea48b0904272354w3267b367hb62ee873b5e50a29@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: inline
Message-ID: <200904281049.54617.Christoph.Egger@amd.com>
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
Cc: Laurent Desnogues <laurent.desnogues@gmail.com>, "C.W. Betts" <computers57@hotmail.com>

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> wro=
te:
> > I'm feeling lazy and I don't want to look at all the e-mails. =A0How do=
 you
> > update your git tree?
>
> 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

Christoph

P.S.: With mercurial you do 'hg pull -u' and local changes are automatically
merged.


=2D-=20
=2D--to satisfy European Law for business letters:
Advanced Micro Devices GmbH
Karl-Hammerschmidt-Str. 34, 85609 Dornach b. Muenchen
Geschaeftsfuehrer: Jochen Polster, Thomas M. McCoy, Giuliano Meroni
Sitz: Dornach, Gemeinde Aschheim, Landkreis Muenchen
Registergericht Muenchen, HRB Nr. 43632