Re: [Qemu-devel] updating git tree

[Andreas Färber]

Am 28.04.2009 um 15:10 schrieb Laurent Vivier:

> Le mardi 28 avril 2009 à 14:57 +0200, François Revol a écrit :
> > > On Tue, Apr 28, 2009 at 1:11 PM, François Revol <address@hidden>
> > > wrote:
> > > [...]
> > > > git: 'stash' is not a git-command
> > > > ...
> > > > is this deprecated or just in another package ?
> > >
> > > It was added in git v1.5.3.
> >
> > Ah, of course, and I don't have the disk space to upgrade from etch  
> > to
> > lenny...
> > fun.
> >
> > I think I'll just send the diffs from the last svn and be done with  
> > it.
>
> you can use:
>
> git diff > tmp.patch
> patch -R -p1 < tmp.patch
> git pull
> patch -p1 < tmp.patch

Or to stick with a `git` workflow, you can do:

git commit -a -m "Description of local change"
git pull

Andreas