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: Mon, 02 Feb 2015 09:03:58 +0100 Message-ID: <87y4og7n9t.fsf@engster.org> References: <20150201003025.18138.95966@vcs.savannah.gnu.org> <54CDC38C.9080701@yandex.ru> <83siepiqys.fsf@gnu.org> <87y4ohd3d3.fsf@igel.home> <87iofl8vdl.fsf@engster.org> <87twz5d2vr.fsf@igel.home> <87egq98m7w.fsf@engster.org> <54CE80E5.2090205@yandex.ru> <83zj8xh0dr.fsf@gnu.org> <54CE8F97.80209@yandex.ru> <83wq41gfc9.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1422864265 2990 80.91.229.3 (2 Feb 2015 08:04:25 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 2 Feb 2015 08:04:25 +0000 (UTC) Cc: emacs-devel@gnu.org, schwab@linux-m68k.org, joakim@verona.se, Dmitry Gutov To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Feb 02 09:04: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 1YIBzb-0000LO-45 for ged-emacs-devel@m.gmane.org; Mon, 02 Feb 2015 09:04:23 +0100 Original-Received: from localhost ([::1]:53400 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YIBza-0006B8-7t for ged-emacs-devel@m.gmane.org; Mon, 02 Feb 2015 03:04:22 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:51696) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YIBzN-00068F-RV for emacs-devel@gnu.org; Mon, 02 Feb 2015 03:04:10 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YIBzK-0000nl-LE for emacs-devel@gnu.org; Mon, 02 Feb 2015 03:04:09 -0500 Original-Received: from randomsample.de ([5.45.97.173]:34159) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YIBzK-0000ng-DH; Mon, 02 Feb 2015 03:04:06 -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=bPgsuaVskrE+QcWEdsmdKBOLf2ZkPffEDeJdUHxp5cw=; b=F4qFy5F1yPynMb0Y1tAWzEqw/AwZRTD9Ckbr78dkKy9+JX4K/0InSL4y4EZICB9Y90p3hyl0ZEP47JO14efGeuV9W/tEfDXO5Sd6QcJm9/72q5AGp9YLGuVCyr5GI0jo; 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 1YIBzH-0002Rp-G2; Mon, 02 Feb 2015 09:04:03 +0100 In-Reply-To: <83wq41gfc9.fsf@gnu.org> (Eli Zaretskii's message of "Mon, 02 Feb 2015 05:30:30 +0200") 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:182235 Archived-At: Eli Zaretskii writes: >> Date: Sun, 01 Feb 2015 22:41:59 +0200 >> From: Dmitry Gutov >> Cc: schwab@linux-m68k.org, joakim@verona.se, deng@randomsample.de, > >> emacs-devel@gnu.org >> >> On 02/01/2015 09:56 PM, Eli Zaretskii wrote: >> >> > When did you last look at "git log --graph"? >> >> My preferred alias for 'git log' contains the '--graph' argument, but I >> haven't pulled the new changes yet. > > It didn't start yesterday. I think we can at least partly fix this by simply doing what Joakim did, but the other way round. We create a branch from the last proper mainline commit Joakim merged into his branch (a2c32b0cfc), do a no-ff merge of master into it and then do a fast-forward merge back: - git checkout -b dagfix a2c32b0cfc9f6d3410e2832d8ea0d4f1df576d1e - git merge --no-ff master - git checkout master - git merge dagfix Opinions? -David