From ncunningham@crca.org.au Tue Jul 29 04:11:52 2008 Return-Path: X-Original-To: tuxonice-devel@lists.tuxonice.net Delivered-To: tuxonice-devel@crca.org.au X-Bogosity: Ham, spamicity=0.000000 Received: from [10.1.1.5] (home.nigel.suspend2.net [203.171.70.205]) by crca.org.au (Postfix) with ESMTP id 5E2AC138004; Tue, 29 Jul 2008 04:11:50 +0000 (UTC) From: Nigel Cunningham To: Kenneth Crudup In-Reply-To: References: Content-Type: text/plain Organization: Christian Reformed Churches of Australia Date: Tue, 29 Jul 2008 14:11:48 +1000 Message-Id: <1217304708.8430.189.camel@nigel-laptop> Mime-Version: 1.0 X-Mailer: Evolution 2.22.3.1 Content-Transfer-Encoding: 7bit Cc: tuxonice-devel@lists.tuxonice.net Subject: Re: [TuxOnIce-devel] Is it possible to do daily Linus' Git-to-ToI merges locally? X-BeenThere: tuxonice-devel@lists.tuxonice.net X-Mailman-Version: 2.1.9 Precedence: list List-Id: TuxOnIce Development Discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Jul 2008 04:11:52 -0000 Hi. On Mon, 2008-07-28 at 18:53 -0700, Kenneth Crudup wrote: > IOW, let's say I have your latest git. Is it possible to somehow merge > in Linus' daily kernel.org git snapshots with whatever I have from you > currently? > > Would I have to do "git cherry-pick" on each commit, or is there a better > way? Git is still somewhat mysterious to me (even after looking at both > trees with "gitk"). > > I only ask 'cause I know you're busy, but there's a feature in the last > couple of commits I'd like to really have (I think one of 'em fixes why > my box just up and panic()s at random times under load with the current > (7/25) ToI git.) That should certainly be possible. The best way to work is to have two branches, one for Linus' tree and one for mine. If you checkout the Linus branch and then fetch the latest changes, then checkout my branch and do a git-merge , you should end up with what you're after. Just to be safe, I'd actually make a second Nigel branch to merge into. That way you still have what you last pulled from my branch in an easily accessible form. Regards, Nigel