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

Matijs van Zuijlen matijs at matijs.net
Wed Feb 25 09:45:07 EST 2009


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.


More information about the Typo-list mailing list