From: Markus Heller <hellerm2@gmail.com>
To: emacs-orgmode@gnu.org
Subject: Re: Org-mode release 7.01
Date: Mon, 19 Jul 2010 11:33:23 -0700 [thread overview]
Message-ID: <0veiezpbik.fsf@gmail.com> (raw)
In-Reply-To: 87lj97fi0l.fsf@gmx.net
Andreas Burtzlaff <andy13@gmx.net> writes:
> 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.
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
next prev parent reply other threads:[~2010-07-19 18:33 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-19 6:43 Org-mode release 7.01 Carsten Dominik
2010-07-19 8:22 ` Christian Moe
2010-07-19 10:38 ` Stefan Vollmar
2010-07-19 8:36 ` Eric S Fraga
2010-07-19 17:52 ` Eric Schulte
2010-07-19 12:47 ` Matt Lundin
2010-07-20 7:49 ` Colin Fraizer
2010-07-19 13:47 ` Ista Zahn
2010-07-19 15:48 ` Carsten Dominik
2010-07-19 14:55 ` Manish
2010-07-19 15:31 ` Scott Randby
2010-07-19 15:49 ` Carsten Dominik
2010-07-19 17:15 ` Markus Heller
2010-07-19 17:38 ` Andreas Burtzlaff
2010-07-19 17:46 ` Markus Heller
2010-07-19 18:23 ` Andreas Burtzlaff
2010-07-19 18:33 ` Markus Heller [this message]
2010-07-19 18:38 ` Erik Iverson
2010-07-19 18:45 ` Carsten Dominik
2010-07-19 18:45 ` Markus Heller
2010-07-19 19:27 ` David Maus
2010-07-20 11:37 ` Bernt Hansen
2010-07-19 23:29 ` Sebastian Rose
2010-07-20 13:40 ` Peter Westlake
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=0veiezpbik.fsf@gmail.com \
--to=hellerm2@gmail.com \
--cc=emacs-orgmode@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.