From mboxrd@z Thu Jan  1 00:00:00 1970
Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail
From: Eli Zaretskii <eliz@gnu.org>
Newsgroups: gmane.emacs.devel
Subject: Re: Merging scratch/substitute-command-keys to master
Date: Sat, 17 Oct 2020 18:05:48 +0300
Message-ID: <834kmsuc37.fsf@gnu.org>
References: <CADwFkmmGH33kxiiYfG6xHzdgNVoO0CK9Z+2pEjs=TotL1LfwLA@mail.gmail.com>
Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214";
	logging-data="19958"; mail-complaints-to="usenet@ciao.gmane.io"
Cc: emacs-devel@gnu.org
To: Stefan Kangas <stefan@marxist.se>
Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Sat Oct 17 17:06:34 2020
Return-path: <emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org>
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 <emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org>)
	id 1kTnmx-00055a-VU
	for ged-emacs-devel@m.gmane-mx.org; Sat, 17 Oct 2020 17:06:31 +0200
Original-Received: from localhost ([::1]:55426 helo=lists1p.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.90_1)
	(envelope-from <emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org>)
	id 1kTnmx-0003qt-2Y
	for ged-emacs-devel@m.gmane-mx.org; Sat, 17 Oct 2020 11:06:31 -0400
Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:46090)
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <eliz@gnu.org>) id 1kTnmH-0003Rc-4E
 for emacs-devel@gnu.org; Sat, 17 Oct 2020 11:05:49 -0400
Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]:56924)
 by eggs.gnu.org with esmtp (Exim 4.90_1)
 (envelope-from <eliz@gnu.org>)
 id 1kTnmG-0002JV-CV; Sat, 17 Oct 2020 11:05:48 -0400
Original-Received: from [176.228.60.248] (port=1283 helo=home-c4e4a596f7)
 by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256)
 (Exim 4.82) (envelope-from <eliz@gnu.org>)
 id 1kTnmF-0005Xq-MW; Sat, 17 Oct 2020 11:05:48 -0400
In-Reply-To: <CADwFkmmGH33kxiiYfG6xHzdgNVoO0CK9Z+2pEjs=TotL1LfwLA@mail.gmail.com>
 (message from Stefan Kangas on Sat, 17 Oct 2020 14:03:25 +0000)
X-BeenThere: emacs-devel@gnu.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: "Emacs development discussions." <emacs-devel.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/emacs-devel>,
 <mailto:emacs-devel-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/emacs-devel>
List-Post: <mailto:emacs-devel@gnu.org>
List-Help: <mailto:emacs-devel-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/emacs-devel>,
 <mailto:emacs-devel-request@gnu.org?subject=subscribe>
Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org
Original-Sender: "Emacs-devel"
 <emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org>
Xref: news.gmane.io gmane.emacs.devel:257946
Archived-At: <http://permalink.gmane.org/gmane.emacs.devel/257946>

> From: Stefan Kangas <stefan@marxist.se>
> Date: Sat, 17 Oct 2020 14:03:25 +0000
> 
> (BTW, do we generally merge branches as-is with their full history or do
> we squash them and push as a single commit?)

It's up to you.

Thanks for working on this.