From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Juri Linkov Newsgroups: gmane.emacs.devel Subject: Re: Ok to backport Eshell manual improvements to 29? Date: Fri, 14 Jul 2023 19:52:27 +0300 Organization: LINKOV.NET Message-ID: <86lefih1v9.fsf@mail.linkov.net> References: <871qhcjnb7.fsf@gmx.de> <1ccb1cae-1eb1-79ce-71bd-133d9d679c5a@gmail.com> <86o7kft1db.fsf@mail.linkov.net> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="20564"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/30.0.50 (x86_64-pc-linux-gnu) Cc: emacs-devel@gnu.org To: Jim Porter Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Fri Jul 14 18:55:58 2023 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 1qKM5G-0005Bl-3X for ged-emacs-devel@m.gmane-mx.org; Fri, 14 Jul 2023 18:55:58 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qKM4U-0000JL-PI; Fri, 14 Jul 2023 12:55:10 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qKM4S-0000J7-Nb for emacs-devel@gnu.org; Fri, 14 Jul 2023 12:55:08 -0400 Original-Received: from relay1-d.mail.gandi.net ([2001:4b98:dc4:8::221]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qKM4Q-0007w4-PG for emacs-devel@gnu.org; Fri, 14 Jul 2023 12:55:08 -0400 Original-Received: by mail.gandi.net (Postfix) with ESMTPSA id 43ED4240002; Fri, 14 Jul 2023 16:54:59 +0000 (UTC) In-Reply-To: (Jim Porter's message of "Fri, 14 Jul 2023 09:29:06 -0700") X-GND-Sasl: juri@linkov.net Received-SPF: pass client-ip=2001:4b98:dc4:8::221; envelope-from=juri@linkov.net; helo=relay1-d.mail.gandi.net X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.29 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-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.devel:307873 Archived-At: >> Is there a policy that requires deleting a merged branch? >> (I'm asking because it was very convenient to type just "-29" >> to complete to the "emacs-29" branch, but now the name >> "backport-eshell-docs-to-29" gets in the way ;-) > > I deleted my scratch branch right after merging it[1]. Maybe you just need > to call something like `git remote prune origin` to clean up your local > references to the branch? Thanks, this helped. I don't remember using this command before, but maybe because I always used `git fetch -p origin`.