From mboxrd@z Thu Jan  1 00:00:00 1970
From: "J. Bruce Fields" <bfields@fieldses.org>
Subject: Re: Documentation (mostly user manual) patches
Date: Mon, 5 Mar 2007 13:38:37 -0500
Message-ID: <20070305183837.GC10980@fieldses.org>
References: <1173045556191-git-send-email-bfields@citi.umich.edu> <7vr6s42xgm.fsf@assigned-by-dhcp.cox.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Cc: git@vger.kernel.org
To: Junio C Hamano <junkio@cox.net>
X-From: git-owner@vger.kernel.org Mon Mar 05 19:39:01 2007
Return-path: <git-owner@vger.kernel.org>
Envelope-to: gcvg-git@gmane.org
Received: from vger.kernel.org ([209.132.176.167])
	by lo.gmane.org with esmtp (Exim 4.50)
	id 1HOI5G-0005kx-4B
	for gcvg-git@gmane.org; Mon, 05 Mar 2007 19:38:54 +0100
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S932275AbXCESiI (ORCPT <rfc822;gcvg-git@m.gmane.org>);
	Mon, 5 Mar 2007 13:38:08 -0500
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932419AbXCESiI
	(ORCPT <rfc822;git-outgoing>); Mon, 5 Mar 2007 13:38:08 -0500
Received: from mail.fieldses.org ([66.93.2.214]:43322 "EHLO fieldses.org"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S932275AbXCESiG (ORCPT <rfc822;git@vger.kernel.org>);
	Mon, 5 Mar 2007 13:38:06 -0500
Received: from bfields by fieldses.org with local (Exim 4.63)
	(envelope-from <bfields@fieldses.org>)
	id 1HOI4z-0005fl-MM; Mon, 05 Mar 2007 13:38:37 -0500
Content-Disposition: inline
In-Reply-To: <7vr6s42xgm.fsf@assigned-by-dhcp.cox.net>
User-Agent: Mutt/1.5.13 (2006-08-11)
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/41471>

On Sun, Mar 04, 2007 at 07:14:33PM -0800, Junio C Hamano wrote:
> Thanks.  I pulled first, but ended up rebasing them on top of
> 'maint', as the updated manual is still perfectly applicable for
> 1.5.0 series.

OK, thanks.

> If it is not too much to ask, I'd prefer future pull insns for
> two branches from your side.  Please maintain a fork of my
> 'maint' and a fork of my 'master' on your side, and apply all
> updates to the manual that is applicable to 1.5.0 series on your
> 'maint'.  If there are updates to the manual that talks about
> new material that will appear in 1.5.1, merge your 'maint' to
> your 'master' and then apply the updates there.

That sounds easy enough; will do.

--b.