From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.diffs,gmane.emacs.devel Subject: Re: master 94ed516 2/4: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs Date: Tue, 06 Oct 2015 20:25:18 +0300 Message-ID: <8337xnykn5.fsf@gnu.org> References: <20151005140014.24070.46905@vcs.savannah.gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1444153011 7895 80.91.229.3 (6 Oct 2015 17:36:51 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 6 Oct 2015 17:36:51 +0000 (UTC) Cc: handa@gnu.org, emacs-devel@gnu.org, emacs-diffs@gnu.org To: bruce.connor.am@gmail.com Original-X-From: emacs-diffs-bounces+gnu-emacs-diffs=m.gmane.org@gnu.org Tue Oct 06 19:36:42 2015 Return-path: Envelope-to: gnu-emacs-diffs@m.gmane.org Original-Received: from eggs.gnu.org ([208.118.235.92]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1ZjWAK-0003pz-GM for gnu-emacs-diffs@m.gmane.org; Tue, 06 Oct 2015 19:36:40 +0200 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZjW9K-0002eL-UM for gnu-emacs-diffs@m.gmane.org; Tue, 06 Oct 2015 13:36:39 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Original-Received: from lists.gnu.org ([2001:4830:134:3::11]:42988) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZjW9K-0001zk-2b for gnu-emacs-diffs@m.gmane.org; Tue, 06 Oct 2015 13:35:38 -0400 Original-Received: from localhost ([::1]:52886 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZjW43-0003mt-IW for gnu-emacs-diffs@m.gmane.org; Tue, 06 Oct 2015 13:30:11 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:48403) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZjVzR-0006lw-7S for emacs-diffs@gnu.org; Tue, 06 Oct 2015 13:25:26 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZjVzP-0004sJ-QD for emacs-diffs@gnu.org; Tue, 06 Oct 2015 13:25:24 -0400 Original-Received: from mtaout25.012.net.il ([80.179.55.181]:56089) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZjVzJ-0004bQ-Fm; Tue, 06 Oct 2015 13:25:17 -0400 Original-Received: from conversion-daemon.mtaout25.012.net.il by mtaout25.012.net.il (HyperSendmail v2007.08) id <0NVT00G006874B00@mtaout25.012.net.il>; Tue, 06 Oct 2015 20:22:38 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([84.94.185.246]) by mtaout25.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NVT00E626XP8Z60@mtaout25.012.net.il>; Tue, 06 Oct 2015 20:22:38 +0300 (IDT) In-reply-to: X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-BeenThere: emacs-diffs@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Mailing list for Emacs changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-diffs-bounces+gnu-emacs-diffs=m.gmane.org@gnu.org Original-Sender: emacs-diffs-bounces+gnu-emacs-diffs=m.gmane.org@gnu.org X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:4830:134:3::11 Xref: news.gmane.org gmane.emacs.diffs:131970 gmane.emacs.devel:191019 Archived-At: > Date: Tue, 6 Oct 2015 18:01:18 +0100 > From: Artur Malabarba > Cc: Kenichi Handa , emacs-diffs@gnu.org, > emacs-devel > > Doing your work on a separate dev branch (and pulling master before > merging dev onto master) is an important piece of git workflow. AFAIU, it all depends on the workflow. We indeed prefer it that way, but I understand it's on no way a universal rule. > Perhaps we ought to document that in the same place we teach people > to clone the repo? We already explain this in CONTRIBUTE.