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: master 47070ed 6/6: Merge branch 'master' of
 git.sv.gnu.org:/srv/git/emacs
Date: Wed, 12 May 2021 15:50:58 +0300
Message-ID: <835yzo3ykt.fsf@gnu.org>
References: <20210512030946.27770.7288@vcs0.savannah.gnu.org>
 <20210512030949.65CD421128@vcs0.savannah.gnu.org> <874kf89xjy.fsf@gmail.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214";
	logging-data="18789"; mail-complaints-to="usenet@ciao.gmane.io"
Cc: rms@gnu.org, emacs-devel@gnu.org
To: Robert Pluim <rpluim@gmail.com>
Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Wed May 12 14:52:09 2021
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 1lgoLR-0004h4-C6
	for ged-emacs-devel@m.gmane-mx.org; Wed, 12 May 2021 14:52:09 +0200
Original-Received: from localhost ([::1]:58024 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 1lgoLQ-0004hW-Ew
	for ged-emacs-devel@m.gmane-mx.org; Wed, 12 May 2021 08:52:08 -0400
Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:38164)
 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 1lgoKQ-0003tu-2q
 for emacs-devel@gnu.org; Wed, 12 May 2021 08:51:06 -0400
Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]:56686)
 by eggs.gnu.org with esmtp (Exim 4.90_1)
 (envelope-from <eliz@gnu.org>)
 id 1lgoKP-00014s-R6; Wed, 12 May 2021 08:51:05 -0400
Original-Received: from 84.94.185.95.cable.012.net.il ([84.94.185.95]:2212
 helo=home-c4e4a596f7)
 by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <eliz@gnu.org>)
 id 1lgoKH-00032h-Ip; Wed, 12 May 2021 08:50:58 -0400
In-Reply-To: <874kf89xjy.fsf@gmail.com> (message from Robert Pluim on Wed, 12
 May 2021 10:16:33 +0200)
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:269200
Archived-At: <http://permalink.gmane.org/gmane.emacs.devel/269200>

> From: Robert Pluim <rpluim@gmail.com>
> Date: Wed, 12 May 2021 10:16:33 +0200
> Cc: Richard Stallman <rms@gnu.org>
> 
>     Richard> Author: Richard Stallman <rms@gnu.org>
>     Richard> Commit: Richard Stallman <rms@gnu.org>
> 
>     Richard>     Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
>     
>     Richard>     What choice do I have?

Richard, can you tell what caused you to ask that question?

> Before pushing you can use 'git pull --rebase' to automatically update
> to the HEAD of the branch youʼre on and then re-apply any commits
> you've made.

My suggestion is just "git pull", without rebasing.  Rebasing can
cause trouble in some rare situation, so we decided long ago not to
encourage that workflow (but if you know well enough what you are
doing, feel free to rebase).