From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: [Emacs-diffs] xwidget 9fe732a 2/2: Better changelog for xwidgets Date: Sun, 01 Feb 2015 18:04:32 +0200 Message-ID: <83fvapipnz.fsf@gnu.org> References: <20150201003025.18138.95966@vcs.savannah.gnu.org> <54CDC38C.9080701@yandex.ru> <83siepiqys.fsf@gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1422806712 17513 80.91.229.3 (1 Feb 2015 16:05:12 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 1 Feb 2015 16:05:12 +0000 (UTC) Cc: dgutov@yandex.ru, 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:11 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 1YHx1J-0008Ks-Gx for ged-emacs-devel@m.gmane.org; Sun, 01 Feb 2015 17:05:09 +0100 Original-Received: from localhost ([::1]:50934 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YHx1I-0003rQ-Rx for ged-emacs-devel@m.gmane.org; Sun, 01 Feb 2015 11:05:08 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:46350) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YHx13-0003rE-Jp for emacs-devel@gnu.org; Sun, 01 Feb 2015 11:04:54 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YHx10-0007uG-Dz for emacs-devel@gnu.org; Sun, 01 Feb 2015 11:04:53 -0500 Original-Received: from mtaout24.012.net.il ([80.179.55.180]:55365) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YHx10-0007tW-7J for emacs-devel@gnu.org; Sun, 01 Feb 2015 11:04:50 -0500 Original-Received: from conversion-daemon.mtaout24.012.net.il by mtaout24.012.net.il (HyperSendmail v2007.08) id <0NJ300I00O3ASX00@mtaout24.012.net.il> for emacs-devel@gnu.org; Sun, 01 Feb 2015 17:56:37 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout24.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NJ300FMEOACPW30@mtaout24.012.net.il>; Sun, 01 Feb 2015 17:56:36 +0200 (IST) In-reply-to: X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 80.179.55.180 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:182184 Archived-At: > From: joakim@verona.se > Date: Sun, 01 Feb 2015 16:52:33 +0100 > Cc: emacs-devel@gnu.org, Dmitry Gutov > > The thing I thought I did was merging from the feature branch to master, > and then push master. Then maybe some Git guru could explain how this happened. > How do I dig myself out of this hole now then? I'll defer to the Git experts. (There's a technique to swap parents of a merge-commit, but I'm not sure it is needed in this case, especially if you are going to revert.)