From mboxrd@z Thu Jan 1 00:00:00 1970 From: Markus Heller Subject: Re: Org-mode release 7.01 Date: Mon, 19 Jul 2010 11:33:23 -0700 Message-ID: <0veiezpbik.fsf@gmail.com> References: <4EED441F-C7A5-43DD-A3C1-3BF478BAAFD2@gmail.com> <0vmxtnpf4i.fsf@gmail.com> <87tynv1ido.fsf@gmx.net> <0viq4bpdo6.fsf@gmail.com> <87lj97fi0l.fsf@gmx.net> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from [140.186.70.92] (port=47263 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Oav9v-0005TE-6s for emacs-orgmode@gnu.org; Mon, 19 Jul 2010 14:33:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Oav9s-0000JI-MT for emacs-orgmode@gnu.org; Mon, 19 Jul 2010 14:33:45 -0400 Received: from lo.gmane.org ([80.91.229.12]:40483) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Oav9s-0000J0-Al for emacs-orgmode@gnu.org; Mon, 19 Jul 2010 14:33:44 -0400 Received: from list by lo.gmane.org with local (Exim 4.69) (envelope-from ) id 1Oav9k-0004FF-9q for emacs-orgmode@gnu.org; Mon, 19 Jul 2010 20:33:36 +0200 Received: from mail.cdrd.ca ([142.103.191.98]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 19 Jul 2010 20:33:36 +0200 Received: from hellerm2 by mail.cdrd.ca with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 19 Jul 2010 20:33:36 +0200 List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: emacs-orgmode@gnu.org Andreas Burtzlaff writes: > Markus Heller writes: > >> Andreas Burtzlaff writes: >> >>> Markus Heller writes: >>> >>>> Carsten Dominik writes: >>>> >>>> [snip] >>>> >>>>> >>>>> Thanks, thanks, thanks! >>>>> >>>>> Enjoy! >>>>> >>>>> - Carsten >>>>> >>>>> P.S. If you are trying to find the 7.01 release on the master branch >>>>> in the repository, you will not. The releases are now on a new branch, >>>>> called "maint", which will contain only commits that are also releases. >>>>> This will make it easier to make minor fixes to a release while >>>>> development >>>>> continues on the master branch. >>>> >>>> This might be a bit OT, I apoligize, but how exactly do I get the new >>>> release with git? I'm new to git, and I've tried the following: >>>> >>>> 1. Change the branch to maint >>>> 2. git pull git://repo.or.cz/org-mode.git maint >>>> >>> >>> That command tries to merge maint with the branch you're currently on - >>> most likely main. >>> >>> If you do not have manual changes in your working tree you can run >>> >>> git reset --hard >>> >>> to undo that merge. >>> >>> >>> I think what you want is: >>> >>> git pull >>> git checkout -t origin/maint >> >> Andreas, >> >> thanks for the reply, worked as advertised. >> >> Cheers >> Markus > > Great, but thinking about it again, it is not necessary to switch to the > maint branch unless you want to stick to releases and not follow the bleeding edge of > development. I assumed I had to switch to the maint branch in order to get the 7.01 release. How could I have done this while staying on the master branch? Thanks Markus