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

Any 'git xxx' command that will show when I did a push?

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

which would be the 5 'git pull's that I did after comitting a change.

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

nope

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

With winmerge - it makes it easy to copy changes over as just <these>
lines or the whole block of changed code.  It's a "visual diff"
program like meld (meldmerge.org) but better.

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

That's probably what I did wrong - made a change, committed it but
didn't do a push.
yup, seems like it..

$ git log --since 3/21/2021
commit 274bd3722e96035c0418a240a9ac9ae4467979d0 (HEAD -> master,
origin/master, origin/HEAD)
Author: Fabian Keil <fk at fabiankeil.de>
Date:   Sun Mar 14 02:23:46 2021 +0100

    Remove #142 as the obsolete pcre code has been removed

and nothing about  Merge branch 'master'  until just before I made my
changes earlier tonight.

Lee