From mboxrd@z Thu Jan 1 00:00:00 1970 From: Geert Uytterhoeven Subject: Re: [PATCH 1/3] m68k: section mismatch fixes: EtherNAT Date: Mon, 2 Feb 2009 08:43:04 +0100 (CET) Message-ID: References: <1b1304130901131349n6b67eac5j1c17f4791dd6718e@mail.gmail.com> <20090114003245.GA4419@cynthia.pants.nu> <357469.86134.qm@web52404.mail.re2.yahoo.com> Mime-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Return-path: Received: from nelson.telenet-ops.be ([195.130.133.66]:59948 "EHLO nelson.telenet-ops.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752695AbZBBHnI (ORCPT ); Mon, 2 Feb 2009 02:43:08 -0500 In-Reply-To: Sender: linux-m68k-owner@vger.kernel.org List-Id: linux-m68k@vger.kernel.org To: Michael Schmitz Cc: "David D. Kilzer" , linux-m68k@vger.kernel.org Hi Michael, On Mon, 2 Feb 2009, Michael Schmitz wrote: > > > (My git tree is in a rough state after I've started to play > > > with switching Atari SCSI to NCR5380.c, or at least a fresh > > > clone of that!) > > > > Have you tried "git stash" yet? > > Obviously not :-) Might be just what I need, thanks. So far I've been working on > a local branch while pulling from Geert's master branch but that may be getting > a bit tricky. If you use `git pull --rebase' it will rebase your changes against my tree, and all patches you sent and I integrated will automatically be detected. Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds