From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Eli Zaretskii 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 10:00:44 +0300 Message-ID: <83im3lztno.fsf@gnu.org> 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> Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="6023"; mail-complaints-to="usenet@ciao.gmane.io" Cc: rpluim@gmail.com, emacs-devel@gnu.org To: rms@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Fri May 14 09:01:45 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 1lhRpR-0001TH-1G for ged-emacs-devel@m.gmane-mx.org; Fri, 14 May 2021 09:01:45 +0200 Original-Received: from localhost ([::1]:37624 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lhRpQ-0003br-3L for ged-emacs-devel@m.gmane-mx.org; Fri, 14 May 2021 03:01:44 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:44244) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lhRod-0002w8-3N for emacs-devel@gnu.org; Fri, 14 May 2021 03:00:57 -0400 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]:44700) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lhRob-00044s-7K; Fri, 14 May 2021 03:00:53 -0400 Original-Received: from 84.94.185.95.cable.012.net.il ([84.94.185.95]:4930 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lhRoH-0000ow-Fb; Fri, 14 May 2021 03:00:35 -0400 In-Reply-To: (message from Richard Stallman on Fri, 14 May 2021 01:23:12 -0400) 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:269273 Archived-At: > From: Richard Stallman > Cc: rpluim@gmail.com, emacs-devel@gnu.org > Date: Fri, 14 May 2021 01:23:12 -0400 > > > I see nothing wrong with what you did, it's one way of dealing with > > local changes when you update from upstream. > > That is a relief. > > But still -- what sort of answer was Git looking for > when it asked me the reason for that merge? Do you remember the question it asked? Was it something like the below? # Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored and an empty message aborts # the commit. 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. What Git wants is to encourage you to edit the log message saying why you did the merge, but in cases like yours there's no good reason worthy of describing, so most people simply ignore that and use the standard log message instead without any changes.