From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Lysw8-00004y-7E
	for qemu-devel@nongnu.org; Tue, 28 Apr 2009 15:25:48 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Lysw3-0008WE-Ow
	for qemu-devel@nongnu.org; Tue, 28 Apr 2009 15:25:47 -0400
Received: from [199.232.76.173] (port=46424 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Lysw3-0008WB-Md
	for qemu-devel@nongnu.org; Tue, 28 Apr 2009 15:25:43 -0400
Received: from smtp2-g21.free.fr ([212.27.42.2]:33489)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <revol@free.fr>) id 1Lysw2-0007Dh-W2
	for qemu-devel@nongnu.org; Tue, 28 Apr 2009 15:25:43 -0400
In-Reply-To: <1E122AE2-0595-45D0-8F90-371328DCF060@web.de>
Subject: Re: [Qemu-devel] updating git tree
From: "=?utf-8?q?Fran=C3=A7ois?= Revol" <revol@free.fr>
Date: Tue, 28 Apr 2009 21:25:56 +0200 CEST
Message-Id: <8110443000-BeMail@laptop>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
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: Andreas =?utf-8?q?F=C3=A4rber?= <andreas.faerber@web.de>
Cc: qemu-devel@nongnu.org

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

So, was it too hard to tell it in the first place =3F ;)

Though it doesn't like me...
I have a file to remove, one to add, and I don't want to commit all the 
changes at once...

I tried git commit -i (it wanted it) -m "Merge usb-wacom into usb-hid" 
hw/usb-hid.c Makefile hw/usb-wacom.c

but it didn't like usb-wacom.c being already gone by git rm ... 
+ this stupid thing commited the popenaudio.c I wanted to leave for 
another commit despite not using -a...

Plus it used the local hostname to make my email in the commit, and I 
couldn't find git-config as I saw it somewhere to change it...

This is beyond logic.
I thought it was supposed to be simpler but I'll have to git clone 
again, apply each diff and commit them separately... :(

Fran=C3=A7ois.