From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Lyjle-0008Ns-O2
	for qemu-devel@nongnu.org; Tue, 28 Apr 2009 05:38:22 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Lyjla-0008MR-80
	for qemu-devel@nongnu.org; Tue, 28 Apr 2009 05:38:22 -0400
Received: from [199.232.76.173] (port=52297 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Lyjla-0008MM-2Q
	for qemu-devel@nongnu.org; Tue, 28 Apr 2009 05:38:18 -0400
Received: from gecko.sbs.de ([194.138.37.40]:19941)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60)
	(envelope-from <jan.kiszka@siemens.com>) id 1LyjlZ-0006vW-HD
	for qemu-devel@nongnu.org; Tue, 28 Apr 2009 05:38:17 -0400
Message-ID: <49F6CE81.7040809@siemens.com>
Date: Tue, 28 Apr 2009 11:38:09 +0200
From: Jan Kiszka <jan.kiszka@siemens.com>
MIME-Version: 1.0
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
Content-Transfer-Encoding: 7bit
Subject: [Qemu-devel] Re: updating git tree
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 wrote:
> 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
> 
> git stash ; git pull ; git stash pop
> 
> Christoph
> 
> P.S.: With mercurial you do 'hg pull -u' and local changes are automatically
> merged.

If you have non-trivial changes pending, probably in multiple commits, I
can only recommend using stgit (or guilt) to compensate the missing
patch queue feature of git. It allows you to easily navigate back and
forth in your patch queues before finally posting them.

Jan

-- 
Siemens AG, Corporate Technology, CT SE 2
Corporate Competence Center Embedded Linux