Re: git-rebase(1) prior to a PR in in the github.com/freebsd area

On 27/08/2023 19:13, Steve O'Hara-Smith wrote:
> On Sun, 27 Aug 2023 18:42:20 +0100
> Graham Perrin <grahamperrin@gmail.com> wrote:
>
>> I did use 'git rebase -i' with success four days ago, for a PR in
>> someone else's repo (not a fork of a FreeBSD tree). Successful then,
>> however I have used the command so rarely – like, only a handful of
>> occasions over the past year or so – that my mind goes blank. Entirely
>> blank, and using a search engine will make things far worse for me.
>>
>> What should I do first, for the PR above?
> 	I would go with git rebase -i - it pretty much tells you what to do
> if you know what you want - but in this case it boils down to changing the
> pick in front of the commits to a sequence like
>
> edit <first commit>
> squash <second commit>
> squash <third commit>
> ...
>
> 	Then tidying up the commit message.

I did try 'git rebase -i' before my previous post, there was nothing to 
pick (or drop), which is partly why my mind went blank.

Right now I can't repeat the routine, to get more detail, because I'm 
using my local copy of the main branch to update the OS. I might take 
another look tomorrow.

Thanks