From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.io/gmane.emacs.gnus.general/81094 Path: news.gmane.org!not-for-mail From: Steinar Bang Newsgroups: gmane.emacs.gnus.general Subject: Re: New branch for No Gnus Date: Wed, 01 Feb 2012 09:46:59 +0100 Organization: Probably a good idea Message-ID: 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> <87fwevz95x.fsf@gnus.org> <87d39zl732.fsf@FreeBSD.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1328082277 22981 80.91.229.3 (1 Feb 2012 07:44:37 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Wed, 1 Feb 2012 07:44:37 +0000 (UTC) To: ding@gnus.org Original-X-From: ding-owner+M29375@lists.math.uh.edu Wed Feb 01 08:44:35 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 1RsUrl-0002yw-LY for ding-account@gmane.org; Wed, 01 Feb 2012 08:44:29 +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 1RsUrI-0001zY-HM; Wed, 01 Feb 2012 01:44:00 -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 1RsUrH-0001zK-6y for ding@lists.math.uh.edu; Wed, 01 Feb 2012 01:43:59 -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 1RsUrF-0003eq-Qa for ding@lists.math.uh.edu; Wed, 01 Feb 2012 01:43:58 -0600 Original-Received: from plane.gmane.org ([80.91.229.3]) by quimby.gnus.org with esmtp (Exim 4.72) (envelope-from ) id 1RsUrC-0006BF-WB for ding@gnus.org; Wed, 01 Feb 2012 08:43:55 +0100 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1RsUrC-0002iH-5g for ding@gnus.org; Wed, 01 Feb 2012 08:43:54 +0100 Original-Received: from 62.113.137.5 ([62.113.137.5]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Wed, 01 Feb 2012 08:43:54 +0100 Original-Received: from sb by 62.113.137.5 with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Wed, 01 Feb 2012 08:43:54 +0100 X-Injected-Via-Gmane: http://gmane.org/ Mail-Followup-To: ding@gnus.org Original-Lines: 24 Original-X-Complaints-To: usenet@dough.gmane.org X-Gmane-NNTP-Posting-Host: 62.113.137.5 Mail-Copies-To: never User-Agent: Gnus/5.110018 (No Gnus v0.18) Emacs/22.3 (gnu/linux) Cancel-Lock: sha1:pco94mfBfyvi7w1+qbc5GVh1DSw= X-Spam-Score: -0.7 (/) List-ID: Precedence: bulk Xref: news.gmane.org gmane.emacs.gnus.general:81094 Archived-At: >>>>> Raphael Kubo da Costa : > I thought the opposite was the desired outcome? I mean, if you are in > master and merge no-gnus, you'd want the commits made to no-gnus in > the commit log and also the bug fixes they bring. If you use "-s > ours", you'll only get the history, but all the commit contents > (ie. bug fixes) will be dropped. The no-gnus branch had just recently been created off master, so the two branches shared ancestry except for the two commits that weren't supposed to be applied to master (version number changes). Until those version number files are touched again, regular merge can be used. Once those files are touched again, either 1. "git merge --no-ff --no-commit origin/no-gnus" and revert the undesired files or 2. Do a "git merge sha1-of-commit-before-the-version-change-commits" followed by a "git merge -s ours origin/no-gnus" (or merge with the sha1 of the latest commit, if the version number commits are not at the head of the no-gnus branch)