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


On Mon, Nov 9, 2015 at 11:00 AM, jan iversen
<jani@documentfoundation.org> wrote:
Hi.

I have a lode setup with dev/core and dev/work. I use work to work on my own
patches.

Sometimes I have to correct an older patch set, I do the following in core:

git pull
<cherry pick gerrit patch set>
make changes
./logerrit ...


no need to git pull, and when you pull take the habit of doing git
pull -r not git pull
if your git config is set right, git pull shoudl do pit pull -r... but
if not you may end-up with a merge commit.. which is a no-no.

git fetch origin refs/changes/......
git checkout FETCH_HEAD
(note these 2 commands are provided to you in the gerrit ui under the
'download pull-down on the top right.. second choice)

modify build etc..

then
git add <suff changed>
git commit --amend
and
git push origin HEAD:refs/for/master  (assuming the patch was for the
master branch)

then git checkout master to return to master
if there is any left-over changes (and there should not have been or
that indicate you likely did not amend your original commit correctly)
you can do : git reset --hard

Norbert

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.