From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.io/gmane.emacs.gnus.general/81075 Path: news.gmane.org!not-for-mail From: Lars Ingebrigtsen Newsgroups: gmane.emacs.gnus.general Subject: Re: New branch for No Gnus Date: Wed, 01 Feb 2012 01:31:22 +0100 Message-ID: <87fwevz95x.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> <87zkd31o9p.fsf@gnus.org> <87hazbl8ld.fsf@FreeBSD.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1328056316 3362 80.91.229.3 (1 Feb 2012 00:31:56 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Wed, 1 Feb 2012 00:31:56 +0000 (UTC) Cc: ding@gnus.org To: Raphael Kubo da Costa Original-X-From: ding-owner+M29356@lists.math.uh.edu Wed Feb 01 01:31:55 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 1RsO74-0003Wy-Mb for ding-account@gmane.org; Wed, 01 Feb 2012 01:31:50 +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 1RsO6q-0007kc-A3; Tue, 31 Jan 2012 18:31:36 -0600 Original-Received: from mx1.math.uh.edu ([129.7.128.32]) by util0.math.uh.edu with esmtps (TLSv1:AES256-SHA:256) (Exim 4.63) (envelope-from ) id 1RsO6p-0007kS-8j for ding@lists.math.uh.edu; Tue, 31 Jan 2012 18:31:35 -0600 Original-Received: from quimby.gnus.org ([80.91.231.51]) by mx1.math.uh.edu with esmtps (TLSv1:AES256-SHA:256) (Exim 4.76) (envelope-from ) id 1RsO6m-0000uN-3T for ding@lists.math.uh.edu; Tue, 31 Jan 2012 18:31:35 -0600 Original-Received: from hermes.netfonds.no ([80.91.224.195]) by quimby.gnus.org with esmtp (Exim 4.72) (envelope-from ) id 1RsO6k-0003p7-M6 for ding@gnus.org; Wed, 01 Feb 2012 01:31:30 +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 1RsO6f-00074g-06; Wed, 01 Feb 2012 01:31:25 +0100 In-Reply-To: <87hazbl8ld.fsf@FreeBSD.org> (Raphael Kubo da Costa's message of "Tue, 31 Jan 2012 22:07:26 -0200") User-Agent: Gnus/5.130002 (Ma Gnus v0.2) Emacs/24.0.92 (gnu/linux) X-MailScanner-ID: 1RsO6f-00074g-06 MailScanner-NULL-Check: 1328661085.41748@A6qVAZyRIJ/NSUshxxAAjw X-Spam-Status: No X-Spam-Score: -1.9 (-) List-ID: Precedence: bulk Xref: news.gmane.org gmane.emacs.gnus.general:81075 Archived-At: Raphael Kubo da Costa writes: > Are you sure "-s ours" is what you are looking for? If you are on branch > master and use `git merge -s ours no-gnus`, it will effectively bring > no-gnus' history in, but discard _all_ changes from no-gnus. I didn't want the history, either, but I did want to discard all the changes. -- (domestic pets only, the antidote for overdose, milk.) http://lars.ingebrigtsen.no * Sent from my Rome