Re: [Development] how to include further changes while previous commit is still under review?

2018-01-22 Thread Martin Smith
martin From: Konstantin Tokarev <annu...@yandex.ru> Sent: Monday, January 22, 2018 1:30:10 PM To: Martin Smith; Daniel Savi; Samuel Gaist Cc: development@qt-project.org Subject: Re: [Development] how to include further changes while previous commit is still under review? 22.01.2018, 14

Re: [Development] how to include further changes while previous commit is still under review?

2018-01-22 Thread Konstantin Tokarev
er anything, instead > mark commits for edit > >>  martin >> >>   >>  From: Development <development-bounces+martin.smith=qt...@qt-project.org> >> on behalf of Konstantin Tokarev <annu...@yandex.ru> >>  Sent: Mon

Re: [Development] how to include further changes while previous commit is still under review?

2018-01-22 Thread Martin Smith
half of Konstantin Tokarev <annu...@yandex.ru> > Sent: Monday, January 22, 2018 11:31:35 AM > To: Daniel Savi; Samuel Gaist > Cc: development@qt-project.org > Subject: Re: [Development] how to include further changes while previous > commit is still under review? > >

Re: [Development] how to include further changes while previous commit is still under review?

2018-01-22 Thread Konstantin Tokarev
ay, January 22, 2018 11:31:35 AM> To: Daniel Savi; Samuel Gaist> Cc: development@qt-project.org> Subject: Re: [Development] how to include further changes while previous commit is still under review?>> 22.01.2018, 09:34, "Daniel Savi" <daniel.s...@gaess.ch>:>>

Re: [Development] how to include further changes while previous commit is still under review?

2018-01-22 Thread Martin Smith
t-project.org> on behalf of Konstantin Tokarev <annu...@yandex.ru> Sent: Monday, January 22, 2018 11:31:35 AM To: Daniel Savi; Samuel Gaist Cc: development@qt-project.org Subject: Re: [Development] how to include further changes while previous commit is still under review? 22.01.2018, 09:34, &

Re: [Development] how to include further changes while previous commit is still under review?

2018-01-22 Thread Konstantin Tokarev
22.01.2018, 09:34, "Daniel Savi" : > After reading some of the excellent documentation on git-scm.com, I'm > planning to create two branches, one for patch 1 and one for patch 2. So, I > would do "git branch fix1", "git checkout fix1", add some changes from > review,

Re: [Development] how to include further changes while previous commit is still under review?

2018-01-21 Thread Daniel Savi
After reading some of the excellent documentation on git-scm.com, I'm planning to create two branches, one for patch 1 and one for patch 2. So, I would do "git branch fix1", "git checkout fix1", add some changes from review, "git commit --amend", then "git checkout master", "git branch fix2",

Re: [Development] how to include further changes while previous commit is still under review?

2018-01-20 Thread Konstantin Tokarev
21.01.2018, 01:25, "Daniel Savi" : > On 19.01.2018 18:40, Konstantin Tokarev wrote: >>  19.01.2018, 01:58, "Samuel Gaist" :    On 18 Jan 2018, at 22:42, Daniel Savi wrote:    Hello qt devs    I'm back

Re: [Development] how to include further changes while previous commit is still under review?

2018-01-20 Thread Daniel Savi
On 19.01.2018 18:40, Konstantin Tokarev wrote: 19.01.2018, 01:58, "Samuel Gaist" :  On 18 Jan 2018, at 22:42, Daniel Savi wrote:  Hello qt devs  I'm back with another newbie question. I have committed a patch that is still under review on

Re: [Development] how to include further changes while previous commit is still under review?

2018-01-19 Thread Konstantin Tokarev
19.01.2018, 01:58, "Samuel Gaist" : >>  On 18 Jan 2018, at 22:42, Daniel Savi wrote: >> >>  Hello qt devs >> >>  I'm back with another newbie question. I have committed a patch that is >> still under review on gerrit. >> >>  Meanwhile, I've got a

Re: [Development] how to include further changes while previous commit is still under review?

2018-01-18 Thread Samuel Gaist
> On 18 Jan 2018, at 22:42, Daniel Savi wrote: > > Hello qt devs > > I'm back with another newbie question. I have committed a patch that is still > under review on gerrit. > > Meanwhile, I've got a local and unrelated patch on the same file, that I > would like to

[Development] how to include further changes while previous commit is still under review?

2018-01-18 Thread Daniel Savi
Hello qt devs I'm back with another newbie question. I have committed a patch that is still under review on gerrit. Meanwhile, I've got a local and unrelated patch on the same file, that I would like to commit, too. Now, how would I include this patch into my local git repo and how would