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

I'm unaware of such a command.

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

You might want to consider doing it in the future.

I have added:

[pull]
	rebase = true

to my global .gitconfig a while ago to avoid pointless merge commits.

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

It sounds like this should work without merge commits as well
when done on a clean master branch that is in sync with the
remote.

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