From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LyjhS-0006BM-Ks
	for qemu-devel@nongnu.org; Tue, 28 Apr 2009 05:34:02 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LyjhO-0006Am-Tw
	for qemu-devel@nongnu.org; Tue, 28 Apr 2009 05:34:02 -0400
Received: from [199.232.76.173] (port=35449 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LyjhO-0006Aj-Qv
	for qemu-devel@nongnu.org; Tue, 28 Apr 2009 05:33:58 -0400
Received: from mx2.redhat.com ([66.187.237.31]:44787)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <kwolf@redhat.com>) id 1LyjhO-0006JX-CC
	for qemu-devel@nongnu.org; Tue, 28 Apr 2009 05:33:58 -0400
Message-ID: <49F6CD47.7080307@redhat.com>
Date: Tue, 28 Apr 2009 11:32:55 +0200
From: Kevin Wolf <kwolf@redhat.com>
MIME-Version: 1.0
Subject: Re: [Qemu-devel] updating git tree
References: <BAY110-DAV15DFE0635DCC2980E8842B96E0@phx.gbl>	<761ea48b0904272354w3267b367hb62ee873b5e50a29@mail.gmail.com>
	<200904281049.54617.Christoph.Egger@amd.com>
In-Reply-To: <200904281049.54617.Christoph.Egger@amd.com>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
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 <laurent.desnogues@gmail.com>, "C.W. Betts" <computers57@hotmail.com>, qemu-devel@nongnu.org

Christoph Egger schrieb:
> 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.  How 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

Why would you have local (and even more, not committed) changes in the 
master branch? I always work in branches, commit frequently and rebase 
then on the master branch with a clean tree.

Kevin