[typo] Working on a stable release from github by using local branches

Tobias Weisserth tobias.weisserth at gmail.com
Wed Feb 25 12:35:59 EST 2009


You'd work on your master branch. But maybe you want to work on two parallel
branches. One for production code and the other for future releases of your
blog.

On Wed, Feb 25, 2009 at 3:45 PM, Matijs van Zuijlen <matijs at matijs.net>wrote:

> Tobias Weisserth wrote:
>
>> When you're done and you want to merge this with a current revision you
>> can forward-merge like this:
>>
>> git checkout master
>> git pull vanilla_typo master
>> git format-patch -k -m --stdout release_5_2_0..stable_5_2_0 | git am -3 -k
>>
>> As I haven't used this extensively, I advice care. Maybe the git magicians
>> reading this list can verify this or add comments.
>>
>
> I have a comment on this part: Why not just use git merge, like so:
>
> git checkout master
> git pull vanilla_typo master
> git merge stable_5_2_0
>
> Regards,
> Matijs.
>
> _______________________________________________
> Typo-list mailing list
> Typo-list at rubyforge.org
> http://rubyforge.org/mailman/listinfo/typo-list
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://rubyforge.org/pipermail/typo-list/attachments/20090225/8230b778/attachment.html>


More information about the Typo-list mailing list