[Privoxy-devel] Merge commits

[Fabian Keil]

Lee <ler762 at gmail.com> wrote on 2021-03-22:

> On 3/22/21, Fabian Keil <fk at fabiankeil.de> wrote:

> > You seem to have pushed merge commits again ...
> 
> *sigh*
> 
> Is it possible to tell when I did a 'git push'?

A push with changes should result in a commit mail.

It looks like you pushed five merge commits with your last push:
https://lists.privoxy.org/pipermail/privoxy-commits/2021-March/000508.html

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

Do you pull with "rebase = true" or --rebase?

If not, that could explain why you end up with merge commits.
 
> Is it possible that all those merge commits are because I had an
> outstanding change and hadn't pushed it?

Yes, it's possible that you pulled in merge mode while the local master
branch wasn't clean.

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

How do you copy changes over?

If you use "git format-patch" and "git am" on a clean master branch
and only pull into a clean master branch it should work without
getting merge commits.

Also merge commits should be visible if you check the
"git log origin/master.." output before pushing.

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/43531a46/attachment.bin>