From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Lars Ingebrigtsen Newsgroups: gmane.emacs.devel Subject: Re: master 7f4f16b: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs Date: Wed, 28 Jan 2015 14:32:32 +1100 Message-ID: <87mw53zijz.fsf@building.gnus.org> References: <20150128032211.21589.96959@vcs.savannah.gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1422416066 27954 80.91.229.3 (28 Jan 2015 03:34:26 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 28 Jan 2015 03:34:26 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Jan 28 04:34:24 2015 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1YGJOZ-0005B6-Mx for ged-emacs-devel@m.gmane.org; Wed, 28 Jan 2015 04:34:23 +0100 Original-Received: from localhost ([::1]:51124 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YGJOY-0003yk-U3 for ged-emacs-devel@m.gmane.org; Tue, 27 Jan 2015 22:34:22 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:52114) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YGJOR-0003o5-Kr for emacs-devel@gnu.org; Tue, 27 Jan 2015 22:34:19 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YGJON-0002fY-OX for emacs-devel@gnu.org; Tue, 27 Jan 2015 22:34:15 -0500 Original-Received: from smtp.syd.comcen.com.au ([203.23.236.77]:1252) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YGJON-0002fP-6p for emacs-devel@gnu.org; Tue, 27 Jan 2015 22:34:11 -0500 Original-Received: from building.gnus.org ([27.96.197.126]) by smtp.syd.comcen.com.au (8.13.4/8.12.9) with ESMTP id t0S3Wbqq004912 for ; Wed, 28 Jan 2015 14:32:38 +1100 (EST) In-Reply-To: (Lars Ingebrigtsen's message of "Wed, 28 Jan 2015 03:22:12 +0000") User-Agent: Gnus/5.130012 (Ma Gnus v0.12) Emacs/25.0.50 (gnu/linux) X-comcen-MailScanner-Information: Please contact the ISP for more information X-comcen-MailScanner: Found to be clean X-comcen-MailScanner-SpamCheck: not spam, SpamAssassin (not cached, score=0.102, required 4, AWL 0.00, BAYES_50 0.00, RDNS_NONE 0.10) X-comcen-MailScanner-From: larsi@gnus.org X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 203.23.236.77 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:181871 Archived-At: Lars Ingebrigtsen writes: > commit 7f4f16b3ae6fdb59d83cfc01017668f2a564309f > Merge: 1a369fc be2d23e > Author: Lars Magne Ingebrigtsen > Commit: Lars Magne Ingebrigtsen > > 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/