From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-Status: No, score=-4.0 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by dcvr.yhbt.net (Postfix) with ESMTP id 3F6671F5AE for ; Thu, 30 Jul 2020 19:40:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730542AbgG3TkT (ORCPT ); Thu, 30 Jul 2020 15:40:19 -0400 Received: from pb-smtp2.pobox.com ([64.147.108.71]:61141 "EHLO pb-smtp2.pobox.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726650AbgG3TkS (ORCPT ); Thu, 30 Jul 2020 15:40:18 -0400 Received: from pb-smtp2.pobox.com (unknown [127.0.0.1]) by pb-smtp2.pobox.com (Postfix) with ESMTP id ACB116D075; Thu, 30 Jul 2020 15:40:16 -0400 (EDT) (envelope-from junio@pobox.com) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=pobox.com; h=from:to:cc :subject:references:date:in-reply-to:message-id:mime-version :content-type; s=sasl; bh=2hsdqjcRf717uzLYeFcsBPbyK88=; b=jx9I3u eLrV83a4uUWHuZlKDvZ75Aumc3D0joMOJ2xatH802Zh0gYQWLm+SvF3H8GJQV1WB dcKJN5pX4+zkzZCO348xWddC55dpEX2XnGrycW1JHt0ZpDftUR87K4CjO2zx3O1o KoWu7lbfSVwXiKMuqxfvbnzzow1ehIfqZ3+O8= DomainKey-Signature: a=rsa-sha1; c=nofws; d=pobox.com; h=from:to:cc :subject:references:date:in-reply-to:message-id:mime-version :content-type; q=dns; s=sasl; b=mc1M2GtrN/0eCr/sMMJ8lRlsRHgYArTH wpRjP/6QjmPsaTTYv6St/XM8ph8dPuErMukaES6rlI0WpvNW9RlfdmzIBPQ1Izy/ qI+Y9If84nyTyfRjfaB/Er3wUd3zcvuWzbtPy5lggUl2KOE7R4Gdt2alDfGinn7S NJF8kGM7piw= Received: from pb-smtp2.nyi.icgroup.com (unknown [127.0.0.1]) by pb-smtp2.pobox.com (Postfix) with ESMTP id A358F6D074; Thu, 30 Jul 2020 15:40:16 -0400 (EDT) (envelope-from junio@pobox.com) Received: from pobox.com (unknown [35.196.173.25]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pb-smtp2.pobox.com (Postfix) with ESMTPSA id 26C836D073; Thu, 30 Jul 2020 15:40:16 -0400 (EDT) (envelope-from junio@pobox.com) From: Junio C Hamano To: Eric Sunshine Cc: Git List Subject: Re: [PATCH v3 1/2] Revert "fmt-merge-msg: stop treating `master` specially" References: <20200730180237.1392480-1-gitster@pobox.com> <20200730180237.1392480-2-gitster@pobox.com> Date: Thu, 30 Jul 2020 12:40:15 -0700 In-Reply-To: (Eric Sunshine's message of "Thu, 30 Jul 2020 15:10:45 -0400") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Pobox-Relay-ID: 7E2C0C34-D29C-11EA-8EC9-2F5D23BA3BAF-77302942!pb-smtp2.pobox.com Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Eric Sunshine writes: > /On Thu, Jul 30, 2020 at 2:03 PM Junio C Hamano wrote: >> This reverts commit 489947cee5095b168cbac111ff7bd1eadbbd90dd, which >> stopped treating merges into the 'master' branch any specially when > > s/any specially/specially/ > ...or... > s/any specially/as special/ > >> preparing the default merge message. As the goal was not to have >> any single branch designated as special, it solved it by leaving the >> "into " at the end of the title of the default merge >> message for any and all branches. An obvious and easy alternative >> to treat everybody equally could have been to remove it for every >> branch, but that involves loss of information. >> >> We'll introduce a new mechanism to let end-users specify merges into >> which branches would omit the "into " from the title of >> the default merge message, and make the mechanism, when unconfigured, >> treat the traditional 'master' special again, so all the changes to >> the tests we made earlier will become unnecessary, as these tests >> will be run with out configuring the said new mechanism. > > s/with out/without/ > >> Signed-off-by: Junio C Hamano Thanks.