From: Guennadi Liakhovetski Date: Thu, 21 Dec 2006 20:40:05 GMT Subject: Re: Updated Kernel Hacker's guide to git Message-ID: In-Reply-To: <4589F9B1.2020405@garzik.org> 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