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

I don't remember adding that but I have

[pull]
        rebase = false

in my ~/.gitconfig

On my system, a 'man git config' has this bit under pull.rebase

           NOTE: this is a possibly dangerous operation; do not use it unless
           you understand the implications (see git-rebase(1) for details).

I don't understand git-rebase, much less the implications, so I'm a
bit reluctant to try 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".
>> >
>> > 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.

In other words, if I do a 'git pull' before making any changes and
'git commit -a; git push' after making my changes I should be good.
Correct?

Thanks
Lee