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

[Robert Pluim]

>>>>> On Sun, 16 Aug 2020 20:34:44 +0200, Lars Ingebrigtsen <larsi@gnus.org> 
>>>>> said:

    Lars> larsi@gnus.org (Lars Ingebrigtsen) writes:
    >> branch: master
    >> commit bdda935a7d9519b71822270cf98328ae236b257d
    >> Merge: ada0b9b df2ae3f
    >> Author: Lars Ingebrigtsen <larsi@openbsd6.gnus.org>
    >> Commit: Lars Ingebrigtsen <larsi@openbsd6.gnus.org>
    >> 
    >> Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs

    Lars> Eep!  What did I do?

    Lars> This was from my OpenBSD installation, and I forgot to install my
    Lars> .gitconfig file there.

You forgot to add '--rebase' to your 'git pull'.

    Lars> Did I mess anything up badly?

No. Although no doubt thereʼs somebody who's now offended by the
'non-clean' git history for emacs.

Robert