From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.io/gmane.emacs.gnus.general/81014 Path: news.gmane.org!not-for-mail From: Raphael Kubo da Costa Newsgroups: gmane.emacs.gnus.general Subject: Re: New branch for No Gnus Date: Sat, 28 Jan 2012 17:29:31 -0200 Message-ID: <877h0bpqw4.fsf@FreeBSD.org> References: <87bopnvezm.fsf@gnus.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1327779002 5170 80.91.229.3 (28 Jan 2012 19:30:02 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sat, 28 Jan 2012 19:30:02 +0000 (UTC) To: ding@gnus.org Original-X-From: ding-owner+M29296@lists.math.uh.edu Sat Jan 28 20:30:01 2012 Return-path: Envelope-to: ding-account@gmane.org Original-Received: from util0.math.uh.edu ([129.7.128.18]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1RrDyL-0000kG-59 for ding-account@gmane.org; Sat, 28 Jan 2012 20:30:01 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.math.uh.edu) by util0.math.uh.edu with smtp (Exim 4.63) (envelope-from ) id 1RrDyH-000377-A1; Sat, 28 Jan 2012 13:29:57 -0600 Original-Received: from mx2.math.uh.edu ([129.7.128.33]) by util0.math.uh.edu with esmtps (TLSv1:AES256-SHA:256) (Exim 4.63) (envelope-from ) id 1RrDyG-00036w-7e for ding@lists.math.uh.edu; Sat, 28 Jan 2012 13:29:56 -0600 Original-Received: from quimby.gnus.org ([80.91.231.51]) by mx2.math.uh.edu with esmtps (TLSv1:AES256-SHA:256) (Exim 4.76) (envelope-from ) id 1RrDy3-0005AZ-2T for ding@lists.math.uh.edu; Sat, 28 Jan 2012 13:29:56 -0600 Original-Received: from plane.gmane.org ([80.91.229.3]) by quimby.gnus.org with esmtp (Exim 4.72) (envelope-from ) id 1RrDy1-0001ea-9n for ding@gnus.org; Sat, 28 Jan 2012 20:29:41 +0100 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1RrDy0-0000cc-E4 for ding@gnus.org; Sat, 28 Jan 2012 20:29:40 +0100 Original-Received: from 201.82.194.83 ([201.82.194.83]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sat, 28 Jan 2012 20:29:40 +0100 Original-Received: from rakuco by 201.82.194.83 with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sat, 28 Jan 2012 20:29:40 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 29 Original-X-Complaints-To: usenet@dough.gmane.org X-Gmane-NNTP-Posting-Host: 201.82.194.83 User-Agent: Gnus/5.110018 (No Gnus v0.18) Emacs/24.0.90 (berkeley-unix) Cancel-Lock: sha1:VCuXYnILL9TtcwvToI2L0zassWU= X-Spam-Score: -0.7 (/) List-ID: Precedence: bulk Xref: news.gmane.org gmane.emacs.gnus.general:81014 Archived-At: Lars Ingebrigtsen writes: > As previously discussed Shamefully, I have not watched all the recent threads here, so I'm not sure what the purpose of keeping master from a "stable" branch is. Would it be possible to clarify that to a newcomer (ie. only the stable branch is merged back into Emacs etc)? > As usual, I have no idea how to actually do something like that with > git, so could someone give a recipe? :-) I guess it depends on the above: one possibility would be creating a branch off master and regularly (or whenever you guys feel it's necessary) merge it back into master to make it receive the bug fixes as well. What's not clear is whether the same branch will be used in the future for the same purpose. If it's not, one could do something as follows: $ git checkout -b no-gnus-with-unique-version-identifier master $ # edit files, commit etc $ git push origin no-gnus-with-unique-version-identifier And then later: $ git checkout master $ git merge [--log] no-gnus-with-unique-version-identifier $ git push origin master Merging the ChangeLog entries can be problematic, though.