Re: master bdda935 2/2: Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs

[Robert Pluim]

>>>>> On Mon, 17 Aug 2020 10:57:11 -0400, Stefan Monnier 
>>>>> <monnier@iro.umontreal.ca> said:

    >> You forgot to add '--rebase' to your 'git pull'.
    Stefan> Doesn't Git offer some way to *merge* (not rebase) but with the 
branches swapped?
    Stefan> [ As if you merged HEAD into dest rather than the reverse ]

Probably, but I donʼt know how. I just set up git to auto-rebase, and
spare my limited brain cycles for other stuff :-)

Robert