From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Andreas Schwab Newsgroups: gmane.emacs.devel Subject: Re: master 47070ed 6/6: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs Date: Fri, 14 May 2021 16:49:33 +0200 Message-ID: <87pmxts742.fsf@igel.home> References: <20210512030946.27770.7288@vcs0.savannah.gnu.org> <20210512030949.65CD421128@vcs0.savannah.gnu.org> <874kf89xjy.fsf@gmail.com> <835yzo3ykt.fsf@gnu.org> <83v97n16l8.fsf@gnu.org> <83im3lztno.fsf@gnu.org> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="7852"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) Cc: Eli Zaretskii , emacs-devel@gnu.org, rms@gnu.org, rpluim@gmail.com To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Fri May 14 16:50:19 2021 Return-path: Envelope-to: ged-emacs-devel@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1lhZ8s-0001tz-NO for ged-emacs-devel@m.gmane-mx.org; Fri, 14 May 2021 16:50:18 +0200 Original-Received: from localhost ([::1]:59422 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lhZ8r-0002ay-BR for ged-emacs-devel@m.gmane-mx.org; Fri, 14 May 2021 10:50:17 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:60052) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lhZ8J-0001vF-Cv for emacs-devel@gnu.org; Fri, 14 May 2021 10:49:43 -0400 Original-Received: from mail-out.m-online.net ([212.18.0.9]:44722) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lhZ8H-0000DY-Ad; Fri, 14 May 2021 10:49:43 -0400 Original-Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 4FhWdV50Tzz1qxJC; Fri, 14 May 2021 16:49:34 +0200 (CEST) Original-Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 4FhWdV4R37z1qvy8; Fri, 14 May 2021 16:49:34 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Original-Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id 1iFsrYAxQR4l; Fri, 14 May 2021 16:49:33 +0200 (CEST) X-Auth-Info: ouz6F2ZiH57oUxgk1pkc0hTN4a6Oyk0ObVlaj3SGnu3IKJHHBa3DWZfGnD+eKqL7 Original-Received: from igel.home (ppp-46-244-178-196.dynamic.mnet-online.de [46.244.178.196]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPSA; Fri, 14 May 2021 16:49:33 +0200 (CEST) Original-Received: by igel.home (Postfix, from userid 1000) id 5E1CD2C366E; Fri, 14 May 2021 16:49:33 +0200 (CEST) X-Yow: My haircut is totally traditional! In-Reply-To: (Stefan Monnier's message of "Fri, 14 May 2021 09:45:11 -0400") Received-SPF: pass client-ip=212.18.0.9; envelope-from=whitebox@nefkom.net; helo=mail-out.m-online.net X-Spam_score_int: -23 X-Spam_score: -2.4 X-Spam_bar: -- X-Spam_report: (-2.4 / 5.0 requ) BAYES_00=-1.9, HEADER_FROM_DIFFERENT_DOMAINS=0.248, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.io gmane.emacs.devel:269284 Archived-At: On Mai 14 2021, Stefan Monnier wrote: > Indeed: when the merge doesn't encounter any conflict, it will create the > commit with the default message without asking you. You must be using a very old version of git. Nowadays git merge always asks you to edit the commit message. Andreas. -- Andreas Schwab, schwab@linux-m68k.org GPG Key fingerprint = 7578 EB47 D4E5 4D69 2510 2552 DF73 E780 A9DA AEC1 "And now for something completely different."