From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Michael Mattie Newsgroups: gmane.emacs.devel Subject: Re: Git transition workflow Date: Thu, 14 Aug 2014 03:44:05 -0700 Message-ID: <20140814034405.609ebc7b@runbox.com> References: <2720487.3bKIskrhp0@descartes> <87sil214zs.fsf@drakenvlieg.flower> <87lhqtv7vf.fsf@Rainer.invalid> <87iolxhwep.fsf@uwakimon.sk.tsukuba.ac.jp> <87bnroicu2.fsf@uwakimon.sk.tsukuba.ac.jp> 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 1408013127 19383 80.91.229.3 (14 Aug 2014 10:45:27 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 14 Aug 2014 10:45:27 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Aug 14 12:45:20 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 1XHsX2-0001h3-5d for ged-emacs-devel@m.gmane.org; Thu, 14 Aug 2014 12:45:20 +0200 Original-Received: from localhost ([::1]:53225 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XHsX1-0005pB-Qn for ged-emacs-devel@m.gmane.org; Thu, 14 Aug 2014 06:45:19 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:48401) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XHsWr-0005eQ-LM for emacs-devel@gnu.org; Thu, 14 Aug 2014 06:45:16 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XHsWk-0003zh-Te for emacs-devel@gnu.org; Thu, 14 Aug 2014 06:45:09 -0400 Original-Received: from aibo.runbox.com ([91.220.196.211]:45334) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XHsWk-0003x3-Nq for emacs-devel@gnu.org; Thu, 14 Aug 2014 06:45:02 -0400 Original-Received: from [10.9.9.207] (helo=mailfront03.runbox.com) by bars.runbox.com with esmtp (Exim 4.71) (envelope-from ) id 1XHsWi-00029c-Tq for emacs-devel@gnu.org; Thu, 14 Aug 2014 12:45:01 +0200 Original-Received: from c-50-135-50-173.hsd1.wa.comcast.net ([50.135.50.173] helo=localhost) by mailfront03.runbox.com with esmtpsa (uid:809090 ) (SSL3.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.76) id 1XHsVu-0007j1-AW for emacs-devel@gnu.org; Thu, 14 Aug 2014 12:44:10 +0200 In-Reply-To: X-Mailer: Claws Mail 3.9.0 (GTK+ 2.24.24; x86_64-pc-linux-gnu) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 91.220.196.211 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:173659 Archived-At: On Thu, 14 Aug 2014 01:09:13 +0400 Sergey Organov wrote: > "Stephen J. Turnbull" writes: > > > Sergey Organov writes: > > > > > 1. CVS in fact does the rebase > > > > Great! Plenty of git fans without a clue about what "workflow" > > means, who are perfectly qualified to advocate making the same > > mistakes I did in the CVS to Bazaar transition! > > I'm sorry, I probably was just lucky to switch from cvs right to git > instead, avoiding the main mistake you made (or was forced to make) > altogether, though I did consider bzr at some point. > Just a quick thought from the peanut gallery. It might really help to create some git aliases based on the Emacs developers workflows and some basic git usage. a setup could create a local branch for the dev. a merge would merge local branch to master etc... The full git usage involves alot of options and commands and the chatter from getting a basic workflow straightened out, and cut & pasted into various places can be avoided largely. Mike M