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 bdda935 2/2: Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs Date: Mon, 17 Aug 2020 22:05:32 +0200 Message-ID: <871rk5t4vn.fsf@igel.home> References: <20200816182558.16607.52991@vcs0.savannah.gnu.org> <20200816182601.16F2A209AC@vcs0.savannah.gnu.org> <87imdisam3.fsf@gnus.org> <87d03ptg3c.fsf@igel.home> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="20124"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) Cc: Robert Pluim , Lars Ingebrigtsen , emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Mon Aug 17 22:06:25 2020 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 1k7lOi-00058N-JB for ged-emacs-devel@m.gmane-mx.org; Mon, 17 Aug 2020 22:06:24 +0200 Original-Received: from localhost ([::1]:57384 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7lOh-0004rQ-Lb for ged-emacs-devel@m.gmane-mx.org; Mon, 17 Aug 2020 16:06:23 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:37538) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7lO0-00047p-Az for emacs-devel@gnu.org; Mon, 17 Aug 2020 16:05:40 -0400 Original-Received: from mail-out.m-online.net ([212.18.0.10]:33110) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7lNy-0006p1-9Q for emacs-devel@gnu.org; Mon, 17 Aug 2020 16:05:40 -0400 Original-Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 4BVlQj4L4Fz1rvm9; Mon, 17 Aug 2020 22:05:33 +0200 (CEST) Original-Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 4BVlQj3wYDz1qrF4; Mon, 17 Aug 2020 22:05:33 +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 uBgYhQk7SntP; Mon, 17 Aug 2020 22:05:32 +0200 (CEST) X-Auth-Info: al/dXT/8yz3SVIhIZqtxQBMz9rv15t8xB9vBIlAQCqUXIOo9xJ17LPXPuJvU18Hp Original-Received: from igel.home (ppp-46-244-189-146.dynamic.mnet-online.de [46.244.189.146]) (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; Mon, 17 Aug 2020 22:05:32 +0200 (CEST) Original-Received: by igel.home (Postfix, from userid 1000) id 367B62C113B; Mon, 17 Aug 2020 22:05:32 +0200 (CEST) X-Yow: I'm EMOTIONAL now because I have MERCHANDISING CLOUT!! In-Reply-To: (Stefan Monnier's message of "Mon, 17 Aug 2020 15:54:31 -0400") Received-SPF: pass client-ip=212.18.0.10; envelope-from=whitebox@nefkom.net; helo=mail-out.m-online.net X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/17 16:05:33 X-ACL-Warn: Detected OS = Linux 3.11 and newer X-Spam_score_int: -15 X-Spam_score: -1.6 X-Spam_bar: - X-Spam_report: (-1.6 / 5.0 requ) BAYES_00=-1.9, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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:253912 Archived-At: On Aug 17 2020, Stefan Monnier wrote: >>> Doesn't Git offer some way to *merge* (not rebase) but with the branches swapped? >> A merge always uses HEAD as the first parent, so if you want to swap, >> swap HEAD. > > How can I do that in a way that as seamless as `git merge`? You just need to make sure HEAD points to the commit you want as the first parent. 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."