From: Junio C Hamano Date: Thu, 22 Nov 2007 10:42:20 GMT Subject: Re: Addendum to "MaintNotes" Message-ID: <7vve7u5zoz.fsf@gitster.siamese.dyndns.org> In-Reply-To: <20071122103600.GA10389@sigill.intra.peff.net> Jeff King writes: > Thanks for writing this, Junio. It is always interesting to see git > workflows discussed in detail, and yours is more interesting than most. Now I've written this down, I can sleep well at night, knowing that I can safely be hit by a bus any day ;-) > On Wed, Nov 21, 2007 at 04:32:55PM -0800, Junio C Hamano wrote: > >> - Obviously correct fixes that pertain to the tip of 'master' >> are directly applied to 'master'. >> >> This step is done with "git am". >> >> $ git checkout maint ;# or "git checkout maint" > > One of those "maints" should probably be "master". Heh, thanks. I am hoping somebody do grammartical copyediting and throw back a patch to add it in Documentation/howto.