From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: David Engster Newsgroups: gmane.emacs.devel Subject: Re: [Emacs-diffs] xwidget 9fe732a 2/2: Better changelog for xwidgets Date: Sun, 01 Feb 2015 17:11:18 +0100 Message-ID: <87iofl8vdl.fsf@engster.org> References: <20150201003025.18138.95966@vcs.savannah.gnu.org> <54CDC38C.9080701@yandex.ru> <83siepiqys.fsf@gnu.org> <87y4ohd3d3.fsf@igel.home> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1422807111 23476 80.91.229.3 (1 Feb 2015 16:11:51 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 1 Feb 2015 16:11:51 +0000 (UTC) Cc: Eli Zaretskii , emacs-devel@gnu.org, joakim@verona.se, Dmitry Gutov To: Andreas Schwab Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Feb 01 17:11:50 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 1YHx7j-0004Vp-W9 for ged-emacs-devel@m.gmane.org; Sun, 01 Feb 2015 17:11:48 +0100 Original-Received: from localhost ([::1]:50954 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YHx7i-0007H4-RU for ged-emacs-devel@m.gmane.org; Sun, 01 Feb 2015 11:11:46 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:48366) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YHx7Q-0007G8-1r for emacs-devel@gnu.org; Sun, 01 Feb 2015 11:11:33 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YHx7K-0001vz-Iz for emacs-devel@gnu.org; Sun, 01 Feb 2015 11:11:27 -0500 Original-Received: from randomsample.de ([5.45.97.173]:33489) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YHx7K-0001vt-Cl; Sun, 01 Feb 2015 11:11:22 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=randomsample.de; s=a; h=Content-Type:MIME-Version:Message-ID:Date:References:In-Reply-To:Subject:Cc:To:From; bh=yb2r9x70MWRBgrlWkKMH3bLStG59ptnvGGZWZJYby4M=; b=Yn2QHgsLLhZgdyW4P4gs270ppv/d9bwZ/Sr4EiSgUdCqUYbIws4/mrLztH5fWZ+Y0AjkGGk76islpgQ2UJN8oqUYyCV3hVYpUTZP7cjaLyyTmkRY3cxrlEkEdnloPh7L; Original-Received: from ip4d149227.dynamic.kabel-deutschland.de ([77.20.146.39] helo=spaten) by randomsample.de with esmtpsa (TLS1.2:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1YHx7J-00020W-My; Sun, 01 Feb 2015 17:11:21 +0100 In-Reply-To: <87y4ohd3d3.fsf@igel.home> (Andreas Schwab's message of "Sun, 01 Feb 2015 17:05:12 +0100") User-Agent: Gnus/5.13001 (Ma Gnus v0.10) Emacs/24.3.91 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 5.45.97.173 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:182188 Archived-At: Andreas Schwab writes: > 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 Yes, but I'm willing to bet he actually *did* switch to 'master' afterwards and did git merge xwidget which was then however resolved as 'fast-forward', so you don't see it. -David