Re: master 47070ed 6/6: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

[Robert Pluim]

>>>>> On Tue, 11 May 2021 23:09:49 -0400 (EDT), rms@gnu.org (Richard M. 
>>>>> Stallman) said:

    Richard> branch: master
    Richard> commit 47070ed39eda524d334e5f82dc7f4a50b8d3252c
    Richard> Merge: 67722ab 5784b42
    Richard> Author: Richard Stallman <rms@gnu.org>
    Richard> Commit: Richard Stallman <rms@gnu.org>

    Richard>     Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
    
    Richard>     What choice do I have?

Before pushing you can use 'git pull --rebase' to automatically update
to the HEAD of the branch youʼre on and then re-apply any commits
you've made. If you want to always do that, add 'rebase = true' to the
definition of your branch in .git/config. eg I have:

[branch "master"]
        remote = origin
        merge = refs/heads/master
        rebase = true

As far as I know emacs has no stated preference for merge vs rebase,
so all this is optional.

Robert
--