From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Andreas Schwab Newsgroups: gmane.emacs.devel Subject: Re: Both 'master' and 'trunk'? Date: Thu, 13 Nov 2014 17:26:23 +0100 Message-ID: References: <83k32zkurh.fsf@gnu.org> <83bnobkr9b.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1415896012 1988 80.91.229.3 (13 Nov 2014 16:26:52 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 13 Nov 2014 16:26:52 +0000 (UTC) Cc: emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Nov 13 17:26:45 2014 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1XoxEK-00037b-9F for ged-emacs-devel@m.gmane.org; Thu, 13 Nov 2014 17:26:44 +0100 Original-Received: from localhost ([::1]:60872 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XoxEJ-0004DM-ON for ged-emacs-devel@m.gmane.org; Thu, 13 Nov 2014 11:26:43 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:51730) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XoxEB-0004C6-Oy for emacs-devel@gnu.org; Thu, 13 Nov 2014 11:26:40 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XoxE6-0006x4-G9 for emacs-devel@gnu.org; Thu, 13 Nov 2014 11:26:35 -0500 Original-Received: from cantor2.suse.de ([195.135.220.15]:36957 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XoxE0-0006wC-PB; Thu, 13 Nov 2014 11:26:24 -0500 Original-Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id F25B6AB07; Thu, 13 Nov 2014 16:26:23 +0000 (UTC) X-Yow: .. bleakness.... desolation.... plastic forks... In-Reply-To: <83bnobkr9b.fsf@gnu.org> (Eli Zaretskii's message of "Thu, 13 Nov 2014 18:19:12 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x (no timestamps) [generic] X-Received-From: 195.135.220.15 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 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-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:176948 Archived-At: Eli Zaretskii writes: > However, I still see it here in the "git branch -a" command. Should I > do something locally, in addition to what you did? Use git fetch --prune. Andreas. -- Andreas Schwab, SUSE Labs, schwab@suse.de GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE 1748 E4D4 88E3 0EEA B9D7 "And now for something completely different."