From mboxrd@z Thu Jan  1 00:00:00 1970
From: Junio C Hamano <gitster@pobox.com>
Subject: Re: Addendum to "MaintNotes"
Date: Thu, 22 Nov 2007 02:42:20 -0800
Message-ID: <7vve7u5zoz.fsf@gitster.siamese.dyndns.org>
References: <46dff0320711210511g7d9febf5k47b082cc13bb905a@mail.gmail.com>
	<7vhcjf9l1k.fsf@gitster.siamese.dyndns.org>
	<20071122103600.GA10389@sigill.intra.peff.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Cc: Git Mailing List <git@vger.kernel.org>,
	Ping Yin <pkufranky@gmail.com>
To: Jeff King <peff@peff.net>
X-From: git-owner@vger.kernel.org Thu Nov 22 11:43:09 2007
Return-path: <git-owner@vger.kernel.org>
Envelope-to: gcvg-git-2@gmane.org
Received: from vger.kernel.org ([209.132.176.167])
	by lo.gmane.org with esmtp (Exim 4.50)
	id 1Iv9WW-0003zO-Kw
	for gcvg-git-2@gmane.org; Thu, 22 Nov 2007 11:43:09 +0100
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1751989AbXKVKm3 (ORCPT <rfc822;gcvg-git-2@m.gmane.org>);
	Thu, 22 Nov 2007 05:42:29 -0500
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751993AbXKVKm3
	(ORCPT <rfc822;git-outgoing>); Thu, 22 Nov 2007 05:42:29 -0500
Received: from sceptre.pobox.com ([207.106.133.20]:45164 "EHLO
	sceptre.pobox.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1751989AbXKVKm2 (ORCPT <rfc822;git@vger.kernel.org>);
	Thu, 22 Nov 2007 05:42:28 -0500
Received: from sceptre (localhost.localdomain [127.0.0.1])
	by sceptre.pobox.com (Postfix) with ESMTP id AF6332EF;
	Thu, 22 Nov 2007 05:42:47 -0500 (EST)
Received: from pobox.com (ip68-225-240-77.oc.oc.cox.net [68.225.240.77])
	(using TLSv1 with cipher AES128-SHA (128/128 bits))
	(No client certificate requested)
	by sceptre.sasl.smtp.pobox.com (Postfix) with ESMTP id 4127C977A0;
	Thu, 22 Nov 2007 05:42:44 -0500 (EST)
In-Reply-To: <20071122103600.GA10389@sigill.intra.peff.net> (Jeff King's
	message of "Thu, 22 Nov 2007 05:36:00 -0500")
User-Agent: Gnus/5.110006 (No Gnus v0.6) Emacs/21.4 (gnu/linux)
Sender: git-owner@vger.kernel.org
Precedence: bulk
X-Mailing-List: git@vger.kernel.org
Archived-At: <http://permalink.gmane.org/gmane.comp.version-control.git/65777>

Jeff King <peff@peff.net> 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.