Re: [Qemu-devel] updating git tree

[Christoph Egger]

On Tuesday 28 April 2009 08:54:56 Laurent Desnogues wrote:
> On Tue, Apr 28, 2009 at 8:50 AM, C.W. Betts <address@hidden> 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.


-- 
---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