Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1423078AbWLUUqk (ORCPT ); Thu, 21 Dec 2006 15:46:40 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1423084AbWLUUqk (ORCPT ); Thu, 21 Dec 2006 15:46:40 -0500 Received: from srv5.dvmed.net ([207.36.208.214]:44758 "EHLO mail.dvmed.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1423078AbWLUUqj (ORCPT ); Thu, 21 Dec 2006 15:46:39 -0500 Message-ID: <458AF2AC.4080304@garzik.org> Date: Thu, 21 Dec 2006 15:46:36 -0500 From: Jeff Garzik User-Agent: Thunderbird 1.5.0.9 (X11/20061219) MIME-Version: 1.0 To: Guennadi Liakhovetski CC: Linux Kernel , Git Mailing List Subject: Re: Updated Kernel Hacker's guide to git References: <4589F9B1.2020405@garzik.org> In-Reply-To: Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: -4.3 (----) X-Spam-Report: SpamAssassin version 3.1.7 on srv5.dvmed.net summary: Content analysis details: (-4.3 points, 5.0 required) Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 917 Lines: 29 Guennadi Liakhovetski wrote: > On Wed, 20 Dec 2006, Jeff Garzik wrote: > >> I refreshed my git intro/cookbook for kernel hackers, at >> http://linux.yyz.us/git-howto.html > > Very nice, thanks! A couple of remarks from an absolute git newbie: > > 1. I heard "git am" is supposed to supersede apply-mbox Hey, that's pretty neat. Glad you told me, this should improve my workflow a bit. > 2. What I often have problems with is - what to do if git spits at me a > bunch of conflict messages after a seemingly safe pull or similar. Don't > know if you want to cover those points but "git troubleshooting" would > definitely be a valuable document. Agreed. Jeff - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/