From: "François Revol" <revol@free.fr>
To: Laurent Vivier <Laurent.Vivier@bull.net>
Cc: laurent.desnogues@gmail.com, Christoph.Egger@amd.com,
computers57@hotmail.com, qemu-devel@nongnu.org
Subject: Re: [Qemu-devel] updating git tree
Date: Tue, 28 Apr 2009 15:49:26 +0200 CEST [thread overview]
Message-ID: <1340785513-BeMail@laptop> (raw)
In-Reply-To: <1240924206.4655.9.camel@frecb07144>
> > 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
Ok this seems to work at least for now, I've put it in a script like
#!/bin/sh
git diff > tmp.patch && patch -R -p1 < tmp.patch && git pull && patch -
p1 < tmp.patch && rm tmp.patch
Seems there is a git-revert, not sure how to use it anyway...
Oh well...
Thanks.
François.
todo += "learn git";
freetime -= "many days";
next prev parent reply other threads:[~2009-04-28 13:49 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-04-28 6:50 [Qemu-devel] updating git tree C.W. Betts
2009-04-28 6:50 ` C.W. Betts
2009-04-28 6:54 ` Laurent Desnogues
2009-04-28 7:21 ` Bartlomiej Celary
2009-04-28 8:49 ` Christoph Egger
2009-04-28 9:32 ` Kevin Wolf
2009-04-28 9:38 ` [Qemu-devel] " Jan Kiszka
2009-04-28 9:42 ` Laurent Desnogues
2009-04-28 10:04 ` Kevin Wolf
2009-04-28 10:20 ` Jan Kiszka
2009-04-28 10:28 ` Kevin Wolf
2009-04-28 10:48 ` Jan Kiszka
2009-04-28 10:58 ` Kevin Wolf
2009-04-28 11:14 ` Jan Kiszka
2009-04-28 11:15 ` François Revol
2009-04-28 10:25 ` Gerd Hoffmann
2009-04-28 11:11 ` [Qemu-devel] " François Revol
2009-04-28 12:03 ` Laurent Desnogues
2009-04-28 12:57 ` François Revol
2009-04-28 13:10 ` Laurent Vivier
2009-04-28 13:49 ` François Revol [this message]
2009-04-28 13:58 ` Kevin Wolf
2009-04-28 15:10 ` Laurent Vivier
2009-04-28 15:22 ` Kevin Wolf
2009-04-28 15:40 ` Laurent Vivier
2009-04-28 16:51 ` Andreas Färber
2009-04-28 19:25 ` François Revol
2009-04-28 19:49 ` Andreas Färber
2009-04-28 20:17 ` François Revol
2009-04-28 21:01 ` François Revol
2009-04-29 7:54 ` Markus Armbruster
2009-04-29 8:51 ` François Revol
2009-04-29 9:22 ` Markus Armbruster
2009-04-29 9:57 ` François Revol
2009-04-29 7:44 ` Markus Armbruster
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1340785513-BeMail@laptop \
--to=revol@free.fr \
--cc=Christoph.Egger@amd.com \
--cc=Laurent.Vivier@bull.net \
--cc=computers57@hotmail.com \
--cc=laurent.desnogues@gmail.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.