From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Andreas Schwab Newsgroups: gmane.emacs.devel Subject: Re: [Emacs-diffs] xwidget 9fe732a 2/2: Better changelog for xwidgets Date: Sun, 01 Feb 2015 17:05:12 +0100 Message-ID: <87y4ohd3d3.fsf@igel.home> References: <20150201003025.18138.95966@vcs.savannah.gnu.org> <54CDC38C.9080701@yandex.ru> <83siepiqys.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1422806745 18019 80.91.229.3 (1 Feb 2015 16:05:45 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 1 Feb 2015 16:05:45 +0000 (UTC) Cc: Eli Zaretskii , Dmitry Gutov , emacs-devel@gnu.org To: joakim@verona.se Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Feb 01 17:05:40 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 1YHx1n-0000HJ-R6 for ged-emacs-devel@m.gmane.org; Sun, 01 Feb 2015 17:05:39 +0100 Original-Received: from localhost ([::1]:50938 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YHx1m-0004NJ-TY for ged-emacs-devel@m.gmane.org; Sun, 01 Feb 2015 11:05:38 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:46646) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YHx1V-0004My-Uw for emacs-devel@gnu.org; Sun, 01 Feb 2015 11:05:22 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YHx1V-0008Mf-4d for emacs-devel@gnu.org; Sun, 01 Feb 2015 11:05:21 -0500 Original-Received: from mail-out.m-online.net ([212.18.0.9]:57820) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YHx1Q-0008Im-Rz; Sun, 01 Feb 2015 11:05:16 -0500 Original-Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 3kZxvY6ymdz3hjKf; Sun, 1 Feb 2015 17:05:13 +0100 (CET) Original-Received: from localhost (dynscan1.mnet-online.de [192.168.6.68]) by mail.m-online.net (Postfix) with ESMTP id 3kZxvY6Gf1zvh2C; Sun, 1 Feb 2015 17:05:13 +0100 (CET) X-Virus-Scanned: amavisd-new at mnet-online.de Original-Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.68]) (amavisd-new, port 10024) with ESMTP id pfgDRu9HuEsf; Sun, 1 Feb 2015 17:05:13 +0100 (CET) X-Auth-Info: WqimPHAhGQLz04uIaIhscMp2ZpSUEk3liNDp8aGVpqxBow8B6/+ImMp/U8FinBZ/ Original-Received: from igel.home (ppp-212-114-182-189.dynamic.mnet-online.de [212.114.182.189]) by mail.mnet-online.de (Postfix) with ESMTPA; Sun, 1 Feb 2015 17:05:12 +0100 (CET) Original-Received: by igel.home (Postfix, from userid 1000) id A0F922C341F; Sun, 1 Feb 2015 17:05:12 +0100 (CET) X-Yow: Yow! Are you the self-frying president? In-Reply-To: (joakim@verona.se's message of "Sun, 01 Feb 2015 16:52:33 +0100") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.4 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 212.18.0.9 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:182185 Archived-At: joakim@verona.se writes: > The thing I thought I did was merging from the feature branch to master, > and then push master. No, you did exactly the other way round: commit 69815df Merge: 4edad42 a2c32b0 Author: Joakim Verona Date: Sun Feb 1 00:37:46 2015 +0100 Merge branch 'master' into xwidget Andreas. -- Andreas Schwab, schwab@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different."