From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.io/gmane.emacs.gnus.general/81055 Path: news.gmane.org!not-for-mail From: Lars Ingebrigtsen Newsgroups: gmane.emacs.gnus.general Subject: Re: New branch for No Gnus Date: Tue, 31 Jan 2012 19:44:24 +0100 Message-ID: <87obtj4sqf.fsf@gnus.org> References: <87bopnvezm.fsf@gnus.org> <87k44bh84h.fsf@dod.no> <87aa55cctr.fsf@gnus.org> <87aa54riih.fsf@dod.no> <87bopkc0dq.fsf@gnus.org> <87hazb26fm.fsf@dod.no> <87ty3b6c0d.fsf@gnus.org> <87y5snlnwz.fsf@FreeBSD.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1328035484 12923 80.91.229.3 (31 Jan 2012 18:44:44 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Tue, 31 Jan 2012 18:44:44 +0000 (UTC) Cc: ding@gnus.org To: Raphael Kubo da Costa Original-X-From: ding-owner+M29336@lists.math.uh.edu Tue Jan 31 19:44:43 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 1RsIh8-0007GE-Lv for ding-account@gmane.org; Tue, 31 Jan 2012 19:44:42 +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 1RsIh4-0005Wn-AW; Tue, 31 Jan 2012 12:44:38 -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 1RsIh3-0005Wi-ED for ding@lists.math.uh.edu; Tue, 31 Jan 2012 12:44:37 -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 1RsIh2-0000yr-K3 for ding@lists.math.uh.edu; Tue, 31 Jan 2012 12:44:37 -0600 Original-Received: from hermes.netfonds.no ([80.91.224.195]) by quimby.gnus.org with esmtp (Exim 4.72) (envelope-from ) id 1RsIh1-0003a6-7L for ding@gnus.org; Tue, 31 Jan 2012 19:44:35 +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 1RsIgs-0001eS-DO; Tue, 31 Jan 2012 19:44:26 +0100 In-Reply-To: <87y5snlnwz.fsf@FreeBSD.org> (Raphael Kubo da Costa's message of "Tue, 31 Jan 2012 16:36:28 -0200") User-Agent: Gnus/5.130002 (Ma Gnus v0.2) Emacs/24.0.92 (gnu/linux) X-MailScanner-ID: 1RsIgs-0001eS-DO MailScanner-NULL-Check: 1328640266.77696@b78JHUlMXSUOronrdJq8vA X-Spam-Status: No X-Spam-Score: -1.9 (-) List-ID: Precedence: bulk Xref: news.gmane.org gmane.emacs.gnus.general:81055 Archived-At: Raphael Kubo da Costa writes: > You'd get a merge conflict at that point when merging anyway, so I don't > think this kind of thing would end up slipping under the radar. So I should just merge, and then delete all the stuff that Git put into Ma Gnus from No Gnus? (I mean, right now. None of the changes to No Gnus, which are just version numbers, apply to Ma Gnus.) And then after doing that, then all further changes will just apply nicely? I mean, if I then do an actual bug fix in No Gnus, and then merge that into Ma Gnus? That'd be nice. :-) >> So how do I cherry-pick commits? > > git cherry-pick [-x] [--edit] , where can be the SHA-1 > hash or any other way of pointing to a certain commit. I still think > merging makes more sense, though. Right. -- (domestic pets only, the antidote for overdose, milk.) http://lars.ingebrigtsen.no * Sent from my Rome