From mboxrd@z Thu Jan  1 00:00:00 1970
Path: news.gmane.org!not-for-mail
From: Eli Zaretskii <eliz@gnu.org>
Newsgroups: gmane.emacs.devel
Subject: Re: Both 'master' and 'trunk'?
Date: Thu, 13 Nov 2014 18:19:12 +0200
Message-ID: <83bnobkr9b.fsf@gnu.org>
References: <83k32zkurh.fsf@gnu.org> <mvmbnob3xxh.fsf@hawking.suse.de>
Reply-To: Eli Zaretskii <eliz@gnu.org>
NNTP-Posting-Host: plane.gmane.org
X-Trace: ger.gmane.org 1415895579 26075 80.91.229.3 (13 Nov 2014 16:19:39 GMT)
X-Complaints-To: usenet@ger.gmane.org
NNTP-Posting-Date: Thu, 13 Nov 2014 16:19:39 +0000 (UTC)
Cc: emacs-devel@gnu.org
To: Andreas Schwab <schwab@suse.de>
Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Nov 13 17:19:32 2014
Return-path: <emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org>
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 <emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org>)
	id 1Xox7J-0006uc-Kt
	for ged-emacs-devel@m.gmane.org; Thu, 13 Nov 2014 17:19:29 +0100
Original-Received: from localhost ([::1]:60830 helo=lists.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org>)
	id 1Xox7J-00073P-6n
	for ged-emacs-devel@m.gmane.org; Thu, 13 Nov 2014 11:19:29 -0500
Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:47601)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <eliz@gnu.org>) id 1Xox7A-00070h-TB
	for emacs-devel@gnu.org; Thu, 13 Nov 2014 11:19:26 -0500
Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <eliz@gnu.org>) id 1Xox75-0003Nz-L0
	for emacs-devel@gnu.org; Thu, 13 Nov 2014 11:19:20 -0500
Original-Received: from mtaout20.012.net.il ([80.179.55.166]:39283)
	by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <eliz@gnu.org>)
	id 1Xox75-0003Ns-Cg
	for emacs-devel@gnu.org; Thu, 13 Nov 2014 11:19:15 -0500
Original-Received: from conversion-daemon.a-mtaout20.012.net.il by
	a-mtaout20.012.net.il (HyperSendmail v2007.08) id
	<0NEZ00L00JYQUH00@a-mtaout20.012.net.il> for
	emacs-devel@gnu.org; Thu, 13 Nov 2014 18:19:14 +0200 (IST)
Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout20.012.net.il
	(HyperSendmail v2007.08) with ESMTPA id
	<0NEZ00LZDK01NN30@a-mtaout20.012.net.il>;
	Thu, 13 Nov 2014 18:19:14 +0200 (IST)
In-reply-to: <mvmbnob3xxh.fsf@hawking.suse.de>
X-012-Sender: halo1@inter.net.il
X-detected-operating-system: by eggs.gnu.org: Solaris 10
X-Received-From: 80.179.55.166
X-BeenThere: emacs-devel@gnu.org
X-Mailman-Version: 2.1.14
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: <http://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.org@gnu.org
Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org
Xref: news.gmane.org gmane.emacs.devel:176941
Archived-At: <http://permalink.gmane.org/gmane.emacs.devel/176941>

> From: Andreas Schwab <schwab@suse.de>
> Cc: emacs-devel@gnu.org
> Date: Thu, 13 Nov 2014 16:47:06 +0100
> 
> Eli Zaretskii <eliz@gnu.org> writes:
> 
> > Why do we have in the git repo both 'master' and 'trunk' branches?
> > Shouldn't we remove 'trunk',
> 
> Done.

Thanks.

However, I still see it here in the "git branch -a" command.  Should I
do something locally, in addition to what you did?