From mboxrd@z Thu Jan 1 00:00:00 1970 From: Junio C Hamano Subject: Re: [PATCH v3 2/2] Ensure consistent usage of mergetool.keepBackup in git Date: Sat, 11 Apr 2009 13:19:29 -0700 Message-ID: <7v4owvdju6.fsf@gitster.siamese.dyndns.org> References: <9a358c8b6275a7103eb036a2d1d6073bcf191e09.1239376248.git.ferry.huberts@pelagic.nl> <7vljq7dmg2.fsf@gitster.siamese.dyndns.org> <49E0F27C.8070203@pelagic.nl> <49E0F33B.8070806@pelagic.nl> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: git@vger.kernel.org, "Shawn O. Pearce" , David Aguilar , Markus Heidelberg , Charles Bailey To: "Ferry Huberts (Pelagic)" X-From: git-owner@vger.kernel.org Sat Apr 11 22:21:24 2009 Return-path: 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 1Lsjhb-0003Ln-3W for gcvg-git-2@gmane.org; Sat, 11 Apr 2009 22:21:23 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758540AbZDKUTm (ORCPT ); Sat, 11 Apr 2009 16:19:42 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1758154AbZDKUTm (ORCPT ); Sat, 11 Apr 2009 16:19:42 -0400 Received: from a-sasl-fastnet.sasl.smtp.pobox.com ([207.106.133.19]:65237 "EHLO sasl.smtp.pobox.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756695AbZDKUTm (ORCPT ); Sat, 11 Apr 2009 16:19:42 -0400 Received: from localhost.localdomain (unknown [127.0.0.1]) by a-sasl-fastnet.sasl.smtp.pobox.com (Postfix) with ESMTP id ADC82A921E; Sat, 11 Apr 2009 16:19:39 -0400 (EDT) Received: from pobox.com (unknown [68.225.240.211]) (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by a-sasl-fastnet.sasl.smtp.pobox.com (Postfix) with ESMTPSA id 1F018A921D; Sat, 11 Apr 2009 16:19:30 -0400 (EDT) In-Reply-To: <49E0F33B.8070806@pelagic.nl> (Ferry Huberts's message of "Sat, 11 Apr 2009 21:44:59 +0200") User-Agent: Gnus/5.110006 (No Gnus v0.6) Emacs/21.4 (gnu/linux) X-Pobox-Relay-ID: 15B4F644-26D6-11DE-A2C3-C121C5FC92D5-77302942!a-sasl-fastnet.pobox.com Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: "Ferry Huberts (Pelagic)" writes: > Ferry Huberts (Pelagic) wrote: >> Junio C Hamano wrote: >>> Ferry Huberts writes: >>> >>>> In several places merge.keepBackup is used i.s.o. >>>> mergetool.keepBackup. This patch makes it all >>>> consistent for git >>> A silly question. The above makes it sound as if both merge.keepBackup >>> and mergetool.keepBackup are valid, but the latter is preferred, and your >>> patch makes things consistent even though without it there is nothing >>> broken per-se. >>> >>> Is that really is the case? >>> >>> Otherwise, perhaps the title and the message should read like this: >>> >>> Fix misspelled mergetool.keepBackup >>> >>> In several places mergetool.keepBackup was misspelled as merge.keepBackup. >>> >>> Signed-off-by: Ferry Huberts >> >> feel free to change it :-) Notice that I didn't follow the discussion closely, and I am asking if this is a "bugfix" or "changing for consistency even though there is no breakage".