emacs-orgmode
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Orgmode] Re: Org-mode release 7.01


From: Markus Heller
Subject: [Orgmode] Re: Org-mode release 7.01
Date: Mon, 19 Jul 2010 11:33:23 -0700
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/23.2 (windows-nt)

Andreas Burtzlaff <address@hidden> writes:

> Markus Heller <address@hidden> writes:
>
>> Andreas Burtzlaff <address@hidden> writes:
>>
>>> Markus Heller <address@hidden> writes:
>>>
>>>> Carsten Dominik <address@hidden> 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




reply via email to

[Prev in Thread] Current Thread [Next in Thread]