From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Robert Pluim 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 17:37:33 +0200 Message-ID: References: <20200816182558.16607.52991@vcs0.savannah.gnu.org> <20200816182601.16F2A209AC@vcs0.savannah.gnu.org> <87imdisam3.fsf@gnus.org> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="17913"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 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 17:49:35 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 1k7hOB-0004Xq-6z for ged-emacs-devel@m.gmane-mx.org; Mon, 17 Aug 2020 17:49:35 +0200 Original-Received: from localhost ([::1]:54476 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7hOA-0005e8-7O for ged-emacs-devel@m.gmane-mx.org; Mon, 17 Aug 2020 11:49:34 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:56352) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7hCd-0007Fj-0c for emacs-devel@gnu.org; Mon, 17 Aug 2020 11:37:39 -0400 Original-Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:35686) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7hCb-0006kD-Cs for emacs-devel@gnu.org; Mon, 17 Aug 2020 11:37:38 -0400 Original-Received: by mail-wr1-x435.google.com with SMTP id f1so15466652wro.2 for ; Mon, 17 Aug 2020 08:37:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :mime-version:content-transfer-encoding; bh=ED/j+21PUhKv6YEWYkBgr+RLz8JV03V8nJZRmnY8iFs=; b=kv3qFvwGW2q55t3SF6ra3YsosT58S7Gf9UV8mM3wGAxXQp7rftmPCflL/2GwoLufme jOojayaEw0Ltx2fIHtfl2vP/RfRHKuM0Ivum4YpYRX4ea6zDlwhQhCEvciHhQWt1iCEA /UbP17NmHxeAezI287tcxXnfH3JiAE3Gjq5E+mmPzQmMi5EXbTUyLzZppV/s5dUE/qcD jR5uUmi+4wjZ1GbmnAXPenA1EG7FSwx41DOjHc+WM1VYdevM8e+FhkHhkugg9wZHeiZB 1kVhDFAuPzhBLxUBr/u4MbXXSb3oDXe00DV5kd2ypTyTPVrTR0VOWhEqnb8SIRw/cuo8 fGKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:mime-version:content-transfer-encoding; bh=ED/j+21PUhKv6YEWYkBgr+RLz8JV03V8nJZRmnY8iFs=; b=ThzFhudFqx0rhz7Rawd5mBW0Gc9ANImPRVKNR2WO9loqCaYcCSgfSPNcKOvw74tDy5 RXFowcxj85fXzAuavnWUc4lq0H+UAAAiqHFuAd3jHf58/BXWA8XgLRM9xRtbkUwWtO7M 2nsCZhMnB5ZnmRTgv/QG1YUxhUmGQ6umF/Flo9yYDrFJLz7VH84UEgSFSyJfNccxTo0N WCf8NveFOleB3DQBYsJ6ky00Oi2/dJ0uVdnmM6f+J5DuTpMFBYQabJpE4AhpCZMMCn3I wW8FG4kua9bR0k9ri+XvweDCiBSklAzn98H+tRst+7B5/IPh7fPWC09nLwRtv09NA5X2 QxWg== X-Gm-Message-State: AOAM533QijuRAfxfG0xcSHQDdDCrzaVQe8yJP4RnCm0+K5UFud59eLWv JfZhrrnvo4h5wOJ/MjeJwoWImSbcees= X-Google-Smtp-Source: ABdhPJx3MVv0XO60p/I8M5wrteTd7sp19+PsWPts2eU27GSM3XjntGP7o/kJcrQEfLh84lKegzFxjw== X-Received: by 2002:adf:9e8d:: with SMTP id a13mr15292253wrf.94.1597678655511; Mon, 17 Aug 2020 08:37:35 -0700 (PDT) Original-Received: from rpluim-mac ([2a01:e34:ecfc:a860:1ab:3156:7718:83e6]) by smtp.gmail.com with ESMTPSA id v67sm31541116wma.46.2020.08.17.08.37.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 08:37:34 -0700 (PDT) In-Reply-To: (Stefan Monnier's message of "Mon, 17 Aug 2020 10:57:11 -0400") Received-SPF: pass client-ip=2a00:1450:4864:20::435; envelope-from=rpluim@gmail.com; helo=mail-wr1-x435.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, 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:253886 Archived-At: >>>>> On Mon, 17 Aug 2020 10:57:11 -0400, Stefan Monnier said: >> You forgot to add '--rebase' to your 'git pull'. Stefan> Doesn't Git offer some way to *merge* (not rebase) but with the= branches swapped? Stefan> [ As if you merged HEAD into dest rather than the reverse ] Probably, but I don=CA=BCt know how. I just set up git to auto-rebase, and spare my limited brain cycles for other stuff :-) Robert