[Privoxy-devel] Merge commits

[Lee]

On 3/22/21, Fabian Keil <fk at fabiankeil.de> wrote:
> Lee <ler762 at gmail.com> wrote on 2021-03-21:
>
>> On 3/21/21, Fabian Keil <fk at fabiankeil.de> wrote:
>> > Lee <ler762 at gmail.com> wrote on 2021-03-21:
>
>> >> How does this look?
> [...]
>> > Looks good to me.
>>
>> OK - done
>
> Thanks.
>
> You seem to have pushed merge commits again ...

*sigh*

Is it possible to tell when I did a 'git push'?

Since I don't know how, I'm guessing I haven't done a push since Feb 21.
I did make a change & committed it on Mar 2.  Note - no git push
Then a pull on Mar 5, 6, 12, 15 and 21
Then my changes for Mar 21 (each change being a separate commit) and
then the 'git push'

Is it possible that all those merge commits are because I had an
outstanding change and hadn't pushed it?

> Using local branches and rebasing them on master should avoid this:
> https://www.privoxy.org/developer-manual/git.html#GITBRANCHES

I don't use local branches.  I have /source/privoxy/privoxy where I do
all my stuff and
/git/privoxy/privoxy that gets changes copied from /source when I'm
ready to make a change "official".

Thanks
Lee