From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.io/gmane.emacs.gnus.general/81029 Path: news.gmane.org!not-for-mail From: Lars Ingebrigtsen Newsgroups: gmane.emacs.gnus.general Subject: Re: New branch for No Gnus Date: Mon, 30 Jan 2012 18:36:16 +0100 Message-ID: <87aa55cctr.fsf@gnus.org> References: <87bopnvezm.fsf@gnus.org> <87k44bh84h.fsf@dod.no> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1327944994 30374 80.91.229.3 (30 Jan 2012 17:36:34 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Mon, 30 Jan 2012 17:36:34 +0000 (UTC) To: ding@gnus.org Original-X-From: ding-owner+M29310@lists.math.uh.edu Mon Jan 30 18:36:33 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 1Rrv9c-0002v2-7K for ding-account@gmane.org; Mon, 30 Jan 2012 18:36:32 +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 1Rrv9a-0005u0-Kf; Mon, 30 Jan 2012 11:36:30 -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 1Rrv9Z-0005tp-GP for ding@lists.math.uh.edu; Mon, 30 Jan 2012 11:36:29 -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 1Rrv9Y-00042o-K8 for ding@lists.math.uh.edu; Mon, 30 Jan 2012 11:36:29 -0600 Original-Received: from hermes.netfonds.no ([80.91.224.195]) by quimby.gnus.org with esmtp (Exim 4.72) (envelope-from ) id 1Rrv9X-0000N5-6h for ding@gnus.org; Mon, 30 Jan 2012 18:36:27 +0100 Original-Received: from 93-41-188-50.ip82.fastwebnet.it ([93.41.188.50] helo=rusty) by hermes.netfonds.no with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.72) (envelope-from ) id 1Rrv9O-0005Us-CM for ding@gnus.org; Mon, 30 Jan 2012 18:36:18 +0100 In-Reply-To: <87k44bh84h.fsf@dod.no> (Steinar Bang's message of "Sat, 28 Jan 2012 21:42:06 +0100") User-Agent: Gnus/5.110018 (No Gnus v0.18) Emacs/24.0.92 (gnu/linux) X-MailScanner-ID: 1Rrv9O-0005Us-CM MailScanner-NULL-Check: 1328549778.96406@fgUlwxULrRTku8ioapAACA X-Spam-Status: No X-Spam-Score: -1.9 (-) List-ID: Precedence: bulk Xref: news.gmane.org gmane.emacs.gnus.general:81029 Archived-At: Steinar Bang writes: > To work on master and get the latest updates, do > git checkout master > git pull > (now you can work, and when finished, do) > git push origin HEAD > > To get the latest from master into the no-gnus branch: > git checkout no-gnus > git fetch > git merge origin/master > (and if there are no conflicts, do) > git push origin HEAD Well, I'll probably be having separate directories ngnus and mgnus for the two branches, so that I can test and run them concurrently. So I won't be pivoting branches (in the same directory) any, I think? -- (domestic pets only, the antidote for overdose, milk.) http://lars.ingebrigtsen.no * Sent from my Rome