From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Karl Fogel Newsgroups: gmane.emacs.devel Subject: Re: A simple git workflow for the rest of us Date: Sat, 15 Nov 2014 13:47:50 -0600 Message-ID: <87389kkzyx.fsf@floss.red-bean.com> References: <87sihkicso.fsf@Rainer.invalid> Reply-To: Karl Fogel NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1416080897 12648 80.91.229.3 (15 Nov 2014 19:48:17 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 15 Nov 2014 19:48:17 +0000 (UTC) Cc: Achim Gratz , emacs-devel@gnu.org To: Lars Magne Ingebrigtsen Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Nov 15 20:48:10 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 1XpjKL-0002AV-IV for ged-emacs-devel@m.gmane.org; Sat, 15 Nov 2014 20:48:09 +0100 Original-Received: from localhost ([::1]:41797 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpjKL-00042F-7r for ged-emacs-devel@m.gmane.org; Sat, 15 Nov 2014 14:48:09 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:48996) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpjKD-00041x-Hc for emacs-devel@gnu.org; Sat, 15 Nov 2014 14:48:07 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XpjK7-0005CQ-7P for emacs-devel@gnu.org; Sat, 15 Nov 2014 14:48:01 -0500 Original-Received: from mail-ie0-x22b.google.com ([2607:f8b0:4001:c03::22b]:47449) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpjK7-0005CI-2G for emacs-devel@gnu.org; Sat, 15 Nov 2014 14:47:55 -0500 Original-Received: by mail-ie0-f171.google.com with SMTP id x19so19745312ier.2 for ; Sat, 15 Nov 2014 11:47:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:references:reply-to:date:in-reply-to :message-id:user-agent:mime-version:content-type; bh=nGNdnJR1HNRdErRJ+OT21CoBDfzlHY/GDwKdaVUO1GQ=; b=nGsPcF0Ehke7kXUCUFpIVi8sxQqRKVaEfXCoXbjPo6msKgc1zo4ILV6ItozbMXhhwk /DY+kEEvtrOJE9AFKSa9apZVZjqExg69YJlL7g6PfVaJsOh3jIcDo+4/ErPHeSpIn9tM wGFgkkZXi7S+FGC0T65h46r5Svg3pNI8tO0MM9Rm3UN8eXTPDXB43M95Vb+jz5KP5gD6 1nus3VnwiVzqL81U8z2vwfxG67U8DdGPSxGaUtJgQWAXkext1LsqD5pT8exPj8QauxJB BaxYkvD1WBzdP2/FhH/8WS7DzEmzR7LsL2Pem7lOpx6n1UK13AcYkgWDo59EuypDelf3 ZW7Q== X-Received: by 10.50.117.104 with SMTP id kd8mr15015177igb.3.1416080873989; Sat, 15 Nov 2014 11:47:53 -0800 (PST) Original-Received: from floss.red-bean.com ([184.78.71.168]) by mx.google.com with ESMTPSA id w7sm3262834igl.7.2014.11.15.11.47.52 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 15 Nov 2014 11:47:53 -0800 (PST) In-Reply-To: (Lars Magne Ingebrigtsen's message of "Sat, 15 Nov 2014 18:47:48 +0100") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:4001:c03::22b 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:177238 Archived-At: Lars Magne Ingebrigtsen writes: >> Trunk is now known as master. >We can call the trunk the trunk if we want to. We could, but it is a nearly universal convention among git projects to name that branch 'master'. I sure hope Emacs won't be gratuitously different in matters like this :-).