From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.io/gmane.emacs.gnus.general/81096 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 10:10:06 +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> <87vcnr1o78.fsf@gnus.org> <87pqdz1nry.fsf@gnus.org> <87ehuf1nhy.fsf@gnus.org> <87aa531mk5.fsf@gnus.org> <874nvb1m92.fsf@gnus.org> <87zkd3zbo9.fsf@gnus.org> <87ty3bzapf.fsf@gnus.org> <87ipjrxslx.fsf@gnus.org> <87ehufxsic.fsf@gnus.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1328083656 31989 80.91.229.3 (1 Feb 2012 08:07:36 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Wed, 1 Feb 2012 08:07:36 +0000 (UTC) To: ding@gnus.org Original-X-From: ding-owner+M29377@lists.math.uh.edu Wed Feb 01 09:07:32 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 1RsVE2-0004jz-8K for ding-account@gmane.org; Wed, 01 Feb 2012 09:07:30 +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 1RsVDm-00029I-HI; Wed, 01 Feb 2012 02:07:14 -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 1RsVDk-000296-T3 for ding@lists.math.uh.edu; Wed, 01 Feb 2012 02:07:12 -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 1RsVDg-0002FI-Nv for ding@lists.math.uh.edu; Wed, 01 Feb 2012 02:07:12 -0600 Original-Received: from plane.gmane.org ([80.91.229.3]) by quimby.gnus.org with esmtp (Exim 4.72) (envelope-from ) id 1RsVDf-0006kZ-An for ding@gnus.org; Wed, 01 Feb 2012 09:07:07 +0100 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1RsVDd-0004Wz-Pr for ding@gnus.org; Wed, 01 Feb 2012 09:07:05 +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 09:07:05 +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 09:07:05 +0100 X-Injected-Via-Gmane: http://gmane.org/ Mail-Followup-To: ding@gnus.org Original-Lines: 41 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:jKMYOm1xV2jKZXTEy50OvIco/IQ= X-Spam-Score: -0.7 (/) List-ID: Precedence: bulk Xref: news.gmane.org gmane.emacs.gnus.general:81096 Archived-At: >>>>> Lars Ingebrigtsen : > Just to be totally sure I'm not screwing anything up: Should I do a > "git pull" in my local No Gnus tree before saying "git revert -m 2 > HEAD", and then pushing out, or should I just do the revert without > pulling from git.gnus.org first? I assume that this is the fix to the messup that was mentioned earlier in the thread? I've never used git-revert myself, but I would have done it this way: git checkout no-gnus git revert -m 2 HEAD git push -f origin HEAD I could try to explain the logic behind this...? Or I could just mention chapter 3 of "Pro Git" again...:-) Briefly: - if you do "git branch" you will see all local branches in your git repository. - If you do "git branch -a" you will see more branches, some with "remotes/origin/" in front of them. - All local branches exist only in your local .git directory (they do not exist upstream (though for tracking branches (mentioned later) that is a question of semantics...)) - You can only check out and work on a local branch - Some local branches have a special relationship with a remote branch. These local branches are called "tracking branches". In your case, no-gnus and master are tracking branches - When you work on "no-gnus", you can't update "remotes/origin/no-gnus" to have the same commits, in other way than pushing the commits on "no-gnus" to origin. So what I did over, was to: - check out the local tracking branch no-gnus - revert the last two commits on that branch - push the current state of the branch to no-gnus on the remote called "origin", updating the "remotes/origin/no-gnus" branch in your local .git directory in the process - the "-f" ("force") flag to push is necessary to make it drop commits already on the branch in the origin remote