From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Stefan Monnier 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 09:45:11 -0400 Message-ID: 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="35144"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) Cc: rms@gnu.org, rpluim@gmail.com, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Fri May 14 15:46:42 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 1lhY9J-00090m-GU for ged-emacs-devel@m.gmane-mx.org; Fri, 14 May 2021 15:46:41 +0200 Original-Received: from localhost ([::1]:33414 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lhY9I-0003mM-Ie for ged-emacs-devel@m.gmane-mx.org; Fri, 14 May 2021 09:46:40 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:45140) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lhY7y-00026G-N0 for emacs-devel@gnu.org; Fri, 14 May 2021 09:45:18 -0400 Original-Received: from mailscanner.iro.umontreal.ca ([132.204.25.50]:32502) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lhY7w-00012m-HK; Fri, 14 May 2021 09:45:17 -0400 Original-Received: from pmg2.iro.umontreal.ca (localhost.localdomain [127.0.0.1]) by pmg2.iro.umontreal.ca (Proxmox) with ESMTP id 658528083B; Fri, 14 May 2021 09:45:14 -0400 (EDT) Original-Received: from mail01.iro.umontreal.ca (unknown [172.31.2.1]) by pmg2.iro.umontreal.ca (Proxmox) with ESMTP id EC0EC801B5; Fri, 14 May 2021 09:45:12 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=iro.umontreal.ca; s=mail; t=1620999912; bh=w1MuAAjpZPlXjPzQS40vP/60SLtkCVVK3aZlLATuvvQ=; h=From:To:Cc:Subject:References:Date:In-Reply-To:From; b=D58gCKfa+LBxzsQrhe3WKD+0jZZdmiEzohOKTfJmNQljcmr9Vti4ycWP+n34U17R6 n+dynnO8802ECxmnCfDiKiFrptN6tk0acgFAelhypz+gSWmVmDMsBtLEyNIgCx3LND 5u0D2EF6g1xPs+Qle3QRu7LQhZ5emjGSaXnVbMtVj8lhO0dLH7Pm6mg0WSMNRmMHBe o/9VAQkTmJX1J3GusjgnxOGTy8HqBFYdJPvxAmW74HBIyNibyFDSX55vOIXrV/6JwK eoA3pn765G1T+iMi586yTw1KL3mNcR5B6ybHG24Fsibs/vTw8D60qvzpoHJBZS+eAz dq3ZcaqPSBstg== Original-Received: from alfajor (76-10-140-76.dsl.teksavvy.com [76.10.140.76]) by mail01.iro.umontreal.ca (Postfix) with ESMTPSA id B89461201BE; Fri, 14 May 2021 09:45:12 -0400 (EDT) In-Reply-To: <83im3lztno.fsf@gnu.org> (Eli Zaretskii's message of "Fri, 14 May 2021 10:00:44 +0300") Received-SPF: pass client-ip=132.204.25.50; envelope-from=monnier@iro.umontreal.ca; helo=mailscanner.iro.umontreal.ca X-Spam_score_int: -42 X-Spam_score: -4.3 X-Spam_bar: ---- X-Spam_report: (-4.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, RCVD_IN_DNSWL_MED=-2.3, 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:269282 Archived-At: > If so, this is not really a question you need to answer. The line > above it is the merge-commit log message Git prepares for you (it > probably said something like "Merge branch 'master' of > git.sv.gnu.org:/srv/git/emacs"), so basically all you need to do is > "C-c C-c" to let Git use that standard message and proceed with the > merge. Indeed: when the merge doesn't encounter any conflict, it will create the commit with the default message without asking you. Stefan