From mboxrd@z Thu Jan  1 00:00:00 1970
From: Andreas Burtzlaff <andy13@gmx.net>
Subject: Re: Org-mode release 7.01
Date: Mon, 19 Jul 2010 20:23:06 +0200
Message-ID: <87lj97fi0l.fsf@gmx.net>
References: <4EED441F-C7A5-43DD-A3C1-3BF478BAAFD2@gmail.com>
	<0vmxtnpf4i.fsf@gmail.com> <87tynv1ido.fsf@gmx.net>
	<0viq4bpdo6.fsf@gmail.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Return-path: <emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org>
Received: from [140.186.70.92] (port=36189 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OauzU-0002FQ-If
	for emacs-orgmode@gnu.org; Mon, 19 Jul 2010 14:23:01 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <andy13@gmx.net>) id 1OauzS-0006Zj-HM
	for emacs-orgmode@gnu.org; Mon, 19 Jul 2010 14:23:00 -0400
Received: from mail.gmx.net ([213.165.64.20]:53835)
	by eggs.gnu.org with smtp (Exim 4.69)
	(envelope-from <andy13@gmx.net>) id 1OauzS-0006ZQ-4E
	for emacs-orgmode@gnu.org; Mon, 19 Jul 2010 14:22:58 -0400
In-Reply-To: <0viq4bpdo6.fsf@gmail.com> (Markus Heller's message of "Mon, 19
	Jul 2010 10:46:49 -0700")
List-Id: "General discussions about Org-mode." <emacs-orgmode.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/emacs-orgmode>
List-Post: <mailto:emacs-orgmode@gnu.org>
List-Help: <mailto:emacs-orgmode-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=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: Markus Heller <hellerm2@gmail.com>
Cc: emacs-orgmode@gnu.org

Markus Heller <hellerm2@gmail.com> writes:

> Andreas Burtzlaff <andy13@gmx.net> writes:
>
>> Markus Heller <hellerm2@gmail.com> writes:
>>
>>> Carsten Dominik <carsten.dominik@gmail.com> 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.

Andreas

>
>
> _______________________________________________
> Emacs-orgmode mailing list
> Please use `Reply All' to send replies to the list.
> Emacs-orgmode@gnu.org
> http://lists.gnu.org/mailman/listinfo/emacs-orgmode
Andreas