Re: [Flightgear-devel] MiG-15 patches

[Michael D. <mik...@gm...>]

On Thu, Dec 10, 2020 at 09:55:07AM +0000, James Turner wrote:
> 
> 
> > On 10 Dec 2020, at 09:36, Michael Danilov <mik...@gm...> wrote:
> > 
> > About editing old patches after review -- how should I proceed?
> > a) simply add a new commit with the name like 'fixup to "commit name"'
> > b) squash the changes into the patches and reupload
> 
> When using a ‘review-aware-GUI’ (Gerrit, GitHub, etc) I would recommend to amend or fix+squash the original patch, but for our workflow on SF that can be tricky.
> 
> Either way, make sure you squash into ‘feature-sized pieces' before doing the final merge, of course.
> 
> Kind regards,
> James

Does that correspond to `$ git rebase -i` and putting "fixup" and "squash"?