From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Richard Stallman 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 01:23:12 -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> Reply-To: rms@gnu.org Content-Type: text/plain; charset=Utf-8 Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="37444"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 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 07:23:44 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 1lhQIa-0009dk-Kw for ged-emacs-devel@m.gmane-mx.org; Fri, 14 May 2021 07:23:44 +0200 Original-Received: from localhost ([::1]:47504 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lhQIZ-000140-OJ for ged-emacs-devel@m.gmane-mx.org; Fri, 14 May 2021 01:23:43 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:55470) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lhQI4-0000PQ-Qu for emacs-devel@gnu.org; Fri, 14 May 2021 01:23:12 -0400 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]:43146) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lhQI4-0006MJ-Hx; Fri, 14 May 2021 01:23:12 -0400 Original-Received: from rms by fencepost.gnu.org with local (Exim 4.90_1) (envelope-from ) id 1lhQI4-0004iC-6M; Fri, 14 May 2021 01:23:12 -0400 In-Reply-To: <83v97n16l8.fsf@gnu.org> (message from Eli Zaretskii on Thu, 13 May 2021 09:38:27 +0300) 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:269266 Archived-At: [[[ To any NSA and FBI agents reading my email: please consider ]]] [[[ whether defending the US Constitution against all enemies, ]]] [[[ foreign or domestic, requires you to follow Snowden's example. ]]] > 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? -- Dr Richard Stallman (https://stallman.org) Chief GNUisance of the GNU Project (https://gnu.org) Founder, Free Software Foundation (https://fsf.org) Internet Hall-of-Famer (https://internethalloffame.org)