[Top][All Lists]

[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 17:45:31 +1100
User-agent: Gnus/5.130012 (Ma Gnus v0.12) Emacs/25.0.50 (gnu/linux)

Paul Eggert <address@hidden> writes:

> This is git, so nothing is ever destroyed, it's just ... mutated.
> I repaired the problems I found in master commit
> 39c2fa3f4e5bf332cc30266d36d5410c4ffeaac4.  Your commit merged from
> emacs-24, which is generally a good thing to do, so I left that part
> alone.

Oops, sorry.

How did that happen?  I thought I was in either the master branch, or
the shr-fontified branch.  I didn't try to do anything with the emacs-24

git branch seems to agree:

address@hidden trunk]$ git branch
* master
address@hidden trunk]$ cd ..
address@hidden emacs]$ cd shr-fontified/
address@hidden shr-fontified]$ git branch
* shr-fontified


(domestic pets only, the antidote for overdose, milk.)
  bloggy blog http://lars.ingebrigtsen.no/

reply via email to

[Prev in Thread] Current Thread [Next in Thread]