[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: master 7f4f16b: Merge branch 'master' of git.sv.gnu.org:/srv/git/ema
From: |
Lars Ingebrigtsen |
Subject: |
Re: master 7f4f16b: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs |
Date: |
Wed, 28 Jan 2015 14:32:32 +1100 |
User-agent: |
Gnus/5.130012 (Ma Gnus v0.12) Emacs/25.0.50 (gnu/linux) |
Lars Ingebrigtsen <address@hidden> writes:
> commit 7f4f16b3ae6fdb59d83cfc01017668f2a564309f
> Merge: 1a369fc be2d23e
> Author: Lars Magne Ingebrigtsen <address@hidden>
> Commit: Lars Magne Ingebrigtsen <address@hidden>
>
> Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
> ---
> ChangeLog | 14 +
> INSTALL.REPO | 2 +
> autogen.sh | 1 +
> doc/emacs/ChangeLog | 5 +
> doc/emacs/files.texi | 7 +
> etc/ChangeLog | 8 +
Err. I didn't mean for that to happen.
I had created a new branch with git-new-workdir, and just meant to push
the changes there. But somehow the stuff from "git pull" on the trunk
was also pushed? I think?
I hope that didn't ... destroy anything.
--
(domestic pets only, the antidote for overdose, milk.)
bloggy blog http://lars.ingebrigtsen.no/
- Re: master 7f4f16b: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs,
Lars Ingebrigtsen <=
- Re: master 7f4f16b: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs, Lars Ingebrigtsen, 2015/01/27
- Re: master 7f4f16b: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs, Paul Eggert, 2015/01/28
- Re: master 7f4f16b: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs, Lars Ingebrigtsen, 2015/01/28
- Re: master 7f4f16b: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs, Paul Eggert, 2015/01/28
- Re: master 7f4f16b: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs, Lars Ingebrigtsen, 2015/01/28
- Re: master 7f4f16b: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs, Lars Ingebrigtsen, 2015/01/28
- Re: master 7f4f16b: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs, Eli Zaretskii, 2015/01/28
- Re: master 7f4f16b: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs, Andreas Schwab, 2015/01/28
- Re: master 7f4f16b: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs, Yuri Khan, 2015/01/28
- Re: master 7f4f16b: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs, Eli Zaretskii, 2015/01/28