From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.io/gmane.emacs.gnus.general/81063 Path: news.gmane.org!not-for-mail From: Steinar Bang Newsgroups: gmane.emacs.gnus.general Subject: Re: New branch for No Gnus Date: Tue, 31 Jan 2012 21:59:49 +0100 Organization: Probably a good idea Message-ID: <878vknh9kq.fsf@dod.no> 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> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1328043614 9815 80.91.229.3 (31 Jan 2012 21:00:14 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Tue, 31 Jan 2012 21:00:14 +0000 (UTC) To: ding@gnus.org Original-X-From: ding-owner+M29344@lists.math.uh.edu Tue Jan 31 22:00:14 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 1RsKoG-0000Zl-NT for ding-account@gmane.org; Tue, 31 Jan 2012 22:00:13 +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 1RsKoE-0006M9-WA; Tue, 31 Jan 2012 15:00:11 -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 1RsKoD-0006Lz-Tn for ding@lists.math.uh.edu; Tue, 31 Jan 2012 15:00:09 -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 1RsKo9-0001ae-9x for ding@lists.math.uh.edu; Tue, 31 Jan 2012 15:00:09 -0600 Original-Received: from plane.gmane.org ([80.91.229.3]) by quimby.gnus.org with esmtp (Exim 4.72) (envelope-from ) id 1RsKo7-0006pm-Qs for ding@gnus.org; Tue, 31 Jan 2012 22:00:03 +0100 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1RsKo7-0000VU-P5 for ding@gnus.org; Tue, 31 Jan 2012 22:00:03 +0100 Original-Received: from cm-84.208.231.161.getinternet.no ([84.208.231.161]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 31 Jan 2012 22:00:03 +0100 Original-Received: from sb by cm-84.208.231.161.getinternet.no with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 31 Jan 2012 22:00:03 +0100 X-Injected-Via-Gmane: http://gmane.org/ Mail-Followup-To: ding@gnus.org Original-Lines: 15 Original-X-Complaints-To: usenet@dough.gmane.org X-Gmane-NNTP-Posting-Host: cm-84.208.231.161.getinternet.no Mail-Copies-To: never User-Agent: Gnus/5.110018 (No Gnus v0.18) Emacs/23.3 (gnu/linux) Cancel-Lock: sha1:0GWw2h+1BwIkw48ZTTVdavQbXa4= X-Spam-Score: -1.9 (-) List-ID: Precedence: bulk Xref: news.gmane.org gmane.emacs.gnus.general:81063 Archived-At: >>>>> Lars Ingebrigtsen : > 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.) 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".