From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: Fill column indicator functionality Date: Wed, 03 Apr 2019 08:13:53 -0400 Message-ID: References: <20190402153504.jfliuexzn4ntqnn4@Ergus> <83k1gcfm3y.fsf@gnu.org> <20190402163623.2gvlraa5qitzgi6y@Ergus> <83h8bgfj53.fsf@gnu.org> <20190402170031.l64saf2qdr3gez3u@Ergus> <83d0m4fhe6.fsf@gnu.org> <20190402174857.ydvsrgplftya4nti@Ergus> <83a7h8feho.fsf@gnu.org> <20190402212251.ee6jlzptyll24ebo@Ergus> <83sguzekc5.fsf@gnu.org> <20190403102234.gyk45tfk4uypilhn@Ergus> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="16608"; mail-complaints-to="usenet@blaine.gmane.org" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Apr 03 14:14:28 2019 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([209.51.188.17]) by blaine.gmane.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1hBemh-0004DH-MR for ged-emacs-devel@m.gmane.org; Wed, 03 Apr 2019 14:14:27 +0200 Original-Received: from localhost ([127.0.0.1]:57209 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hBemg-0006mk-KJ for ged-emacs-devel@m.gmane.org; Wed, 03 Apr 2019 08:14:26 -0400 Original-Received: from eggs.gnu.org ([209.51.188.92]:35067) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hBemL-0006cw-Aq for emacs-devel@gnu.org; Wed, 03 Apr 2019 08:14:06 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hBemK-0006Qi-E3 for emacs-devel@gnu.org; Wed, 03 Apr 2019 08:14:05 -0400 Original-Received: from [195.159.176.226] (port=60928 helo=blaine.gmane.org) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hBemK-0006NP-4l for emacs-devel@gnu.org; Wed, 03 Apr 2019 08:14:04 -0400 Original-Received: from list by blaine.gmane.org with local (Exim 4.89) (envelope-from ) id 1hBemE-0003dU-B4 for emacs-devel@gnu.org; Wed, 03 Apr 2019 14:13:58 +0200 X-Injected-Via-Gmane: http://gmane.org/ Cancel-Lock: sha1:lfEsex4xxMR/RAfEXLn3H18KzGI= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 195.159.176.226 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.21 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.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.org gmane.emacs.devel:234919 Archived-At: > I tried to do a rebase of the branch (to keep it synchronized with > master) and I see it was not possible to rebase the public branch. As Eli said: you can't force-push, but you can delete-then-repush to get the same effect. > I am wondering that at the end I will need to do a rebase and the squash > locally As a matter of policy we do not require rebasing nor squashing. It's perfectly OK to just "git merge" into "master". What we do want, tho is that the commits that are merged come with proper commit-messages. Stefan