Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1423079AbWLUUkN (ORCPT ); Thu, 21 Dec 2006 15:40:13 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1423081AbWLUUkM (ORCPT ); Thu, 21 Dec 2006 15:40:12 -0500 Received: from mail.gmx.net ([213.165.64.20]:48882 "HELO mail.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1423079AbWLUUkL (ORCPT ); Thu, 21 Dec 2006 15:40:11 -0500 X-Authenticated: #20450766 Date: Thu, 21 Dec 2006 21:40:05 +0100 (CET) From: Guennadi Liakhovetski To: Jeff Garzik cc: Linux Kernel , Git Mailing List Subject: Re: Updated Kernel Hacker's guide to git In-Reply-To: <4589F9B1.2020405@garzik.org> Message-ID: References: <4589F9B1.2020405@garzik.org> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII X-Y-GMX-Trusted: 0 Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 805 Lines: 23 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 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. Thanks Guennadi --- Guennadi Liakhovetski - 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/