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 47070ed 6/6: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs Date: Wed, 12 May 2021 10:16:33 +0200 Message-ID: <874kf89xjy.fsf@gmail.com> References: <20210512030946.27770.7288@vcs0.savannah.gnu.org> <20210512030949.65CD421128@vcs0.savannah.gnu.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="6083"; mail-complaints-to="usenet@ciao.gmane.io" Cc: Richard Stallman To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Wed May 12 10:17:28 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 1lgk3c-0001U8-EK for ged-emacs-devel@m.gmane-mx.org; Wed, 12 May 2021 10:17:28 +0200 Original-Received: from localhost ([::1]:57276 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lgk3b-0003s1-GB for ged-emacs-devel@m.gmane-mx.org; Wed, 12 May 2021 04:17:27 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:34118) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lgk2q-00032L-7W for emacs-devel@gnu.org; Wed, 12 May 2021 04:16:40 -0400 Original-Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]:33558) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lgk2o-0004Gk-H6; Wed, 12 May 2021 04:16:39 -0400 Original-Received: by mail-wm1-x333.google.com with SMTP id o26-20020a1c4d1a0000b0290146e1feccdaso842397wmh.0; Wed, 12 May 2021 01:16:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:gmane-reply-to-list:date:in-reply-to :message-id:mime-version:content-transfer-encoding; bh=PfmXs6leO7kOEQmV0paDRlVndNB14uS0Q/k0vXs3JhY=; b=MDvsskXhUOa+KBwXovhuQkk9S85bUfkQv0g7UkbTIXNVT9ab4MCF6ei6ly/OExOEg9 /1Tz8L3wb5tCfTbi6arvXYlcZINM3aOEaykhdUP71RDzJtQgfxgGW+j5SPjBLTudR2HZ f9XCqEcngoisZP2dZFzTflRBcV+eF6gL0jDYRsyBcz5nveHwISwqiMNYzdiXdHmIubk9 pAazbt5D/d/cBDGWsTybR/bNYWcH0kXNM3CtXqeqve7HuI5+mFLaNIEMHee22JZygGyL e9zMDIJLMNLGGC+mshvjMPBgzGJHl1GKyytUN4InlbtXBWSQenbiIDhW6iBG0a733bHO LvPA== 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 :gmane-reply-to-list:date:in-reply-to:message-id:mime-version :content-transfer-encoding; bh=PfmXs6leO7kOEQmV0paDRlVndNB14uS0Q/k0vXs3JhY=; b=mzUg7UMsLa0GWHwCnGD3fdzgqWXG+DmhENN8YwNuIXFM5SiR1yhvP0geINRzXdU/NX aIqJ/AD6rUPtvu1jzBIhvwEzW2fnc7ITFqLieWZ932IBKXIEzJYl8+TmJ4oXEei57MpH wCh+TqEF9Fkf6UGsr1VulFi04Qhb/p71xL//LbkoAjcDXe/ISE8/H52E+z6gp0I+p15P YvV7DLTbXzX0iwhrh0hMElCR8EZEyvm87TQjMTTV7ws6PYBr1mh1/JBeQoD6s3yb16Z5 zWSTSTajjY0hJsCmKTLsr721xw3F2jkW0qlBXVk8skMtGrCQrIk8wjai0/0NbsuvbUGw Bqkg== X-Gm-Message-State: AOAM532dxLhOAoDOwFU/Z6m7An6mmJ+STpQeIzxmGESyIpRIJQdGB0Xo qgIebSGnMZFUF90DYkGbdRnGxIwKrGo= X-Google-Smtp-Source: ABdhPJz8w7fC5vYZnGzciMGB/yrAay5rAhmHXKAEB93uf2jTgWZ+0QwbqBCRVCReyw5pI81o0xoqzw== X-Received: by 2002:a1c:1f95:: with SMTP id f143mr10201329wmf.77.1620807395373; Wed, 12 May 2021 01:16:35 -0700 (PDT) Original-Received: from rltb ([82.66.8.55]) by smtp.gmail.com with ESMTPSA id 6sm1508901wry.60.2021.05.12.01.16.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 May 2021 01:16:34 -0700 (PDT) Gmane-Reply-To-List: yes In-Reply-To: <20210512030949.65CD421128@vcs0.savannah.gnu.org> (Richard M. Stallman's message of "Tue, 11 May 2021 23:09:49 -0400 (EDT)") Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=rpluim@gmail.com; helo=mail-wm1-x333.google.com 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:269193 Archived-At: >>>>> On Tue, 11 May 2021 23:09:49 -0400 (EDT), rms@gnu.org (Richard M. Sta= llman) said: Richard> branch: master Richard> commit 47070ed39eda524d334e5f82dc7f4a50b8d3252c Richard> Merge: 67722ab 5784b42 Richard> Author: Richard Stallman Richard> Commit: Richard Stallman Richard> Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs =20=20=20=20 Richard> What choice do I have? Before pushing you can use 'git pull --rebase' to automatically update to the HEAD of the branch you=CA=BCre on and then re-apply any commits you've made. If you want to always do that, add 'rebase =3D true' to the definition of your branch in .git/config. eg I have: [branch "master"] remote =3D origin merge =3D refs/heads/master rebase =3D true As far as I know emacs has no stated preference for merge vs rebase, so all this is optional. Robert --=20