From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.io/gmane.emacs.gnus.general/81066 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 23:59:45 +0100 Message-ID: <87pqdz1nry.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> <87obtj4sqf.fsf@gnus.org> <878vknh9kq.fsf@dod.no> <87vcnr1o78.fsf@gnus.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1328050812 32730 80.91.229.3 (31 Jan 2012 23:00:12 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Tue, 31 Jan 2012 23:00:12 +0000 (UTC) To: ding@gnus.org Original-X-From: ding-owner+M29347@lists.math.uh.edu Wed Feb 01 00:00:11 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 1RsMgM-0001Xd-SG for ding-account@gmane.org; Wed, 01 Feb 2012 00:00:11 +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 1RsMgE-0006zJ-DN; Tue, 31 Jan 2012 17:00:02 -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 1RsMgD-0006zB-Ek for ding@lists.math.uh.edu; Tue, 31 Jan 2012 17:00:01 -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 1RsMg9-0002Aa-0b for ding@lists.math.uh.edu; Tue, 31 Jan 2012 17:00:01 -0600 Original-Received: from hermes.netfonds.no ([80.91.224.195]) by quimby.gnus.org with esmtp (Exim 4.72) (envelope-from ) id 1RsMg7-0001Jq-I7 for ding@gnus.org; Tue, 31 Jan 2012 23:59:55 +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 1RsMfz-0005lB-3i for ding@gnus.org; Tue, 31 Jan 2012 23:59:47 +0100 In-Reply-To: <87vcnr1o78.fsf@gnus.org> (Lars Ingebrigtsen's message of "Tue, 31 Jan 2012 23:50:35 +0100") User-Agent: Gnus/5.130002 (Ma Gnus v0.2) Emacs/24.0.92 (gnu/linux) X-MailScanner-ID: 1RsMfz-0005lB-3i MailScanner-NULL-Check: 1328655587.40045@hcK8OR7RdMQqpEsOKhmqMg X-Spam-Status: No X-Spam-Score: -1.9 (-) List-ID: Precedence: bulk Xref: news.gmane.org gmane.emacs.gnus.general:81066 Archived-At: Lars Ingebrigtsen writes: > larsi@rusty:~/mgnus$ git merge -s ours orgin/no-gnus > fatal: 'orgin/no-gnus' does not point to a commit "origin". Me so smart S.M.R.T. And now I'll try to merge a real change made in No Gnus... -- (domestic pets only, the antidote for overdose, milk.) http://lars.ingebrigtsen.no * Sent from my Rome