Re: git / gerrit best work flow ?

2015-11-10 Thread Stephan Bergmann
On 11/09/2015 08:17 PM, Christian Lohmaier wrote: On Mon, Nov 9, 2015 at 6:00 PM, jan iversen wrote: Sometimes I have to correct an older patch set, I do the following in core: git pull This is not only correcting an older patch set, but would also rebase

Re: git / gerrit best work flow ?

2015-11-09 Thread jan iversen
Thanks a lot for the input, I now have a good idea how to explain the work flow to others. I like the idea of branching that is a natural part of GIT. rgds jan i. -- View this message in context: http://nabble.documentfoundation.org/git-gerrit-best-work-flow-tp4165745p4165795.html Sent from

Re: git / gerrit best work flow ?

2015-11-09 Thread Eike Rathke
Hi jan, On Monday, 2015-11-09 10:00:01 -0700, jan iversen wrote: > Sometimes I have to correct an older patch set, I do the following in core: > > git pull > > make changes > ./logerrit ... > > Then in order to cleanup I do > git reset head~ > git checkout files from changeset > > This does

Re: git / gerrit best work flow ?

2015-11-09 Thread Norbert Thiebaud
On Mon, Nov 9, 2015 at 11:00 AM, jan iversen 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 > > make changes >

git / gerrit best work flow ?

2015-11-09 Thread jan iversen
not seem optimal, any suggestion on how to effectively work with different changesets fast ? thanks in advance rgds jan I. -- View this message in context: http://nabble.documentfoundation.org/git-gerrit-best-work-flow-tp4165745.html Sent from the Dev mailing list archive at Nabble.com

Re: git / gerrit best work flow ?

2015-11-09 Thread Christian Lohmaier
On Mon, Nov 9, 2015 at 6:00 PM, jan iversen wrote: > > Sometimes I have to correct an older patch set, I do the following in core: > > git pull Norbert already wrote this: use pull -r > This is not only correcting an older patch set, but would also rebase it. Not