[Privoxy-devel] Merge commits (was: remove warnings for win32 && --disable-pthread)

[Fabian Keil]

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 ...

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

Fabian
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 833 bytes
Desc: OpenPGP digital signature
URL: <https://lists.privoxy.org/pipermail/privoxy-devel/attachments/20210322/ac6a9e96/attachment.bin>