git / gerrit best work flow ?

Stephan Bergmann sbergman at redhat.com
Tue Nov 10 00:29:41 PST 2015


On 11/09/2015 08:17 PM, Christian Lohmaier wrote:
> On Mon, Nov 9, 2015 at 6:00 PM, jan iversen <jani at documentfoundation.org> wrote:
>> Sometimes I have to correct an older patch set, I do the following in core:
>>
>> git pull
>
>> <cherry pick gerrit patch set>
>
> This is not only correcting an older patch set, but would also rebase it.
> Not that this would be a bad thing, but it is doing more than fixing a
> typo or similar.

It typically /is/ a bad thing if you then push the result as a new 
version of an existing gerrit change (which is presumably what the 
./logerrit step does; I don't know anything about that script).  It 
prevents meaningful diffs between different versions of a gerrit change.


More information about the LibreOffice mailing list