From mboxrd@z Thu Jan  1 00:00:00 1970
From: Petr Baudis <pasky@suse.cz>
Subject: Re: [PATCH 0/6] Re: Documentation: warn prominently against
 merging  with dirty trees
Date: Wed, 13 Jan 2010 11:44:33 +0100
Message-ID: <20100113104433.GC25382@machine.or.cz>
References: <cover.1263081032.git.trast@student.ethz.ch>
 <e330d8ca1a9ec38ce40b0f67123b1dd893f0b31c.1263081032.git.trast@student.ethz.ch>
 <20100110044949.GA8974@progeny.tock>
 <7vskaefp2v.fsf@alter.siamese.dyndns.org>
 <20100111021322.GA8480@progeny.tock>
 <7vzl4lbcfl.fsf@alter.siamese.dyndns.org>
 <20100111041318.GA9806@progeny.tock>
 <20100111082123.GA23742@progeny.tock>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Cc: Junio C Hamano <gitster@pobox.com>,
	Thomas Rast <trast@student.ethz.ch>, git@vger.kernel.org
To: Jonathan Nieder <jrnieder@gmail.com>
X-From: git-owner@vger.kernel.org Wed Jan 13 11:54:17 2010
Return-path: <git-owner@vger.kernel.org>
Envelope-to: gcvg-git-2@lo.gmane.org
Received: from vger.kernel.org ([209.132.180.67])
	by lo.gmane.org with esmtp (Exim 4.50)
	id 1NV0rg-00069V-SJ
	for gcvg-git-2@lo.gmane.org; Wed, 13 Jan 2010 11:54:17 +0100
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1755454Ab0AMKyL (ORCPT <rfc822;gcvg-git-2@m.gmane.org>);
	Wed, 13 Jan 2010 05:54:11 -0500
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755317Ab0AMKyK
	(ORCPT <rfc822;git-outgoing>); Wed, 13 Jan 2010 05:54:10 -0500
Received: from w241.dkm.cz ([62.24.88.241]:42360 "EHLO machine.or.cz"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1755259Ab0AMKyK (ORCPT <rfc822;git@vger.kernel.org>);
	Wed, 13 Jan 2010 05:54:10 -0500
X-Greylist: delayed 573 seconds by postgrey-1.27 at vger.kernel.org; Wed, 13 Jan 2010 05:54:09 EST
Received: by machine.or.cz (Postfix, from userid 2001)
	id 1EDF6125A0E8; Wed, 13 Jan 2010 11:44:34 +0100 (CET)
Content-Disposition: inline
In-Reply-To: <20100111082123.GA23742@progeny.tock>
User-Agent: Mutt/1.5.20 (2009-06-14)
Sender: git-owner@vger.kernel.org
Precedence: bulk
List-ID: <git.vger.kernel.org>
X-Mailing-List: git@vger.kernel.org
Archived-At: <http://permalink.gmane.org/gmane.comp.version-control.git/136808>

On Mon, Jan 11, 2010 at 02:21:23AM -0600, Jonathan Nieder wrote:
> Jonathan Nieder (6):
>   Documentation: clarify one-line description for merge

I don't think this is an improvement and prefer the original phrasing.

>   Documentation: merge: move configuration section to the end

Ack.

I will reply to the other patches in separate mails.

				Petr "Pasky" Baudis