Date: prev next · Thread: first prev next last
2013 Archives by date, by thread · List index


Hi Joel,

I've made a couple simple patches for 4.1 master but see no reason
why they can't be in 4.0.1 when it's released. How do I go about
changing branch and then resubmitting patch for 4.0 (and then of
course go back to 4.1 master).

Once they are in master, you can do:

git log # note the sha1 of the commits you want to submit to 4-0
git branch libreoffice-4-0 origin/libreoffice-4-0 # create the branch, possibly you need logerrit/, 
not origin/
git checkout libreoffice-4-0
git cherry-pick -x <sha1> # for each change
# build and runtime-test
git push libreoffice-4-0:refs/for/libreoffice-4-0
git checkout master # go back to master

More here:

https://wiki.documentfoundation.org/Development/gerrit/SubmitPatch

Please make sure you only cherry-pick bugfixes, feature commits should
be master-only.

Hope this helps,

Miklos

Attachment: signature.asc
Description: Digital signature


Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.