[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] updating git tree
From: |
François Revol |
Subject: |
Re: [Qemu-devel] updating git tree |
Date: |
Tue, 28 Apr 2009 13:11:26 +0200 CEST |
> 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
>
git: 'stash' is not a git-command
...
is this deprecated or just in another package ?
François.
- [Qemu-devel] Re: updating git tree, (continued)
- [Qemu-devel] Re: updating git tree, Jan Kiszka, 2009/04/28
- [Qemu-devel] Re: updating git tree, Laurent Desnogues, 2009/04/28
- Re: [Qemu-devel] Re: updating git tree, Kevin Wolf, 2009/04/28
- Re: [Qemu-devel] Re: updating git tree, Jan Kiszka, 2009/04/28
- Re: [Qemu-devel] Re: updating git tree, Kevin Wolf, 2009/04/28
- Re: [Qemu-devel] Re: updating git tree, Jan Kiszka, 2009/04/28
- Re: [Qemu-devel] Re: updating git tree, Kevin Wolf, 2009/04/28
- Re: [Qemu-devel] Re: updating git tree, Jan Kiszka, 2009/04/28
- Re: [Qemu-devel] Re: updating git tree, François Revol, 2009/04/28
- Re: [Qemu-devel] Re: updating git tree, Gerd Hoffmann, 2009/04/28
- Re: [Qemu-devel] updating git tree,
François Revol <=
- Re: [Qemu-devel] updating git tree, Laurent Desnogues, 2009/04/28
- Re: [Qemu-devel] updating git tree, François Revol, 2009/04/28
- Re: [Qemu-devel] updating git tree, Laurent Vivier, 2009/04/28
- Re: [Qemu-devel] updating git tree, François Revol, 2009/04/28
- Re: [Qemu-devel] updating git tree, Kevin Wolf, 2009/04/28
- Re: [Qemu-devel] updating git tree, Laurent Vivier, 2009/04/28
- Re: [Qemu-devel] updating git tree, Kevin Wolf, 2009/04/28
- Re: [Qemu-devel] updating git tree, Laurent Vivier, 2009/04/28
- Re: [Qemu-devel] updating git tree, Andreas Färber, 2009/04/28
- Re: [Qemu-devel] updating git tree, François Revol, 2009/04/28