[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: master bdda935 2/2: Merge branch 'master' of git.savannah.gnu.org:/s
From: |
Eli Zaretskii |
Subject: |
Re: master bdda935 2/2: Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs |
Date: |
Sun, 16 Aug 2020 22:03:18 +0300 |
> From: Lars Ingebrigtsen <larsi@gnus.org>
> Date: Sun, 16 Aug 2020 20:34:44 +0200
>
> 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
>
> Eep! What did I do?
Probably "git pull" after committing, but before pushing that commit.
> This was from my OpenBSD installation, and I forgot to install my
> .gitconfig file there.
>
> Did I mess anything up badly?
No, it happens all the time, and we don't bother noticing. Look at
the result of "git log --graph", and you will see it's okay, looks
like a merge from a branch.
- Re: master bdda935 2/2: Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs, Lars Ingebrigtsen, 2020/08/16
- Re: master bdda935 2/2: Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs,
Eli Zaretskii <=
- Re: master bdda935 2/2: Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs, Robert Pluim, 2020/08/17
- Re: master bdda935 2/2: Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs, Stefan Monnier, 2020/08/17
- Re: master bdda935 2/2: Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs, Andreas Schwab, 2020/08/17
- Re: master bdda935 2/2: Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs, Stefan Monnier, 2020/08/17
- Re: master bdda935 2/2: Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs, Andreas Schwab, 2020/08/17
- Re: master bdda935 2/2: Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs, Stefan Monnier, 2020/08/17
- Re: master bdda935 2/2: Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs, Yuri Khan, 2020/08/18