From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.io/gmane.emacs.gnus.general/81074 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: Tue, 31 Jan 2012 22:07:26 -0200 Message-ID: <87hazbl8ld.fsf@FreeBSD.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> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1328054885 27390 80.91.229.3 (1 Feb 2012 00:08:05 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Wed, 1 Feb 2012 00:08:05 +0000 (UTC) To: ding@gnus.org Original-X-From: ding-owner+M29355@lists.math.uh.edu Wed Feb 01 01:08:05 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 1RsNk1-0003De-3K for ding-account@gmane.org; Wed, 01 Feb 2012 01:08: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 1RsNju-0007aN-ML; Tue, 31 Jan 2012 18:07:54 -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 1RsNjt-0007aD-Je for ding@lists.math.uh.edu; Tue, 31 Jan 2012 18:07:53 -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 1RsNjp-0002Nc-Fw for ding@lists.math.uh.edu; Tue, 31 Jan 2012 18:07:53 -0600 Original-Received: from plane.gmane.org ([80.91.229.3]) by quimby.gnus.org with esmtp (Exim 4.72) (envelope-from ) id 1RsNjo-000359-2r for ding@gnus.org; Wed, 01 Feb 2012 01:07:48 +0100 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1RsNjn-00036m-Oi for ding@gnus.org; Wed, 01 Feb 2012 01:07:47 +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 ; Wed, 01 Feb 2012 01:07:47 +0100 Original-Received: from rakuco by 201.82.194.83 with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Wed, 01 Feb 2012 01:07:47 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 22 Original-X-Complaints-To: usenet@dough.gmane.org X-Gmane-NNTP-Posting-Host: 201.82.194.83 User-Agent: Gnus/5.130002 (Ma Gnus v0.2) Emacs/24.0.90 (berkeley-unix) Cancel-Lock: sha1:bkpib9kxuitce5ugwjIjAO9IMCo= X-Spam-Score: -0.7 (/) List-ID: Precedence: bulk Xref: news.gmane.org gmane.emacs.gnus.general:81074 Archived-At: Lars Ingebrigtsen writes: > Steinar Bang writes: > >> If you know that the current changes in no-gnus that differ from master >> don't apply, then just >> git fetch >> git merge -s ours orgin/no-gnus >> and you won't be bothered by those changes on future merges (until those >> files change again) >> >> "-s ours" means "make it look like a merge, but all stuff on the current >> branch stays the way it is". > > Great! That has to be just what I need right now, I think, since none > of the changes I made to No Gnus should end up in Ma Gnus. > > I'll try that now... 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.