Re: [Flightgear-devel] MiG-15 patches

[Florent R. <f.r...@gm...>]

Hi,

On Thu, Dec 10, 2020 at 11:31 AM James Turner <ja...@fl...> wrote:
>
> But mostly it works fine: use ‘fixup’ to combine the fixes into the original change, and use ’squash’ to combine fixes. Once you squash, un-squashing is awkward, so just decide carefully.

I've always found `git rebase -i` to work great and be easy to use.
You don't even need to memorize the difference between `squash` and
`fixup`, because the file you have to edit to give the `git rebase -i`
instructions has concise & clear enough comments. Seeing Michael's
work, I don't think using `git rebase -i` would be a problem for him.

As you said, there is the possibility of using `git rebase --abort`.
Also, once done, things are *not* lost, because you can use `git
reflog` to go back in history for any branch (things only get deleted
when using `git gc`). And finally, when unsure and about to do a big
or delicate change, there is always the possibility of doing a
temporary local backup of the repo for the peace of mind. :-)

Regards