From: Ulrich Mueller <ulm@gentoo.org>
To: David Engster <deng@randomsample.de>
Cc: Eli Zaretskii <eliz@gnu.org>, Dmitry Gutov <dgutov@yandex.ru>,
schwab@linux-m68k.org, joakim@verona.se, emacs-devel@gnu.org
Subject: Re: [Emacs-diffs] xwidget 9fe732a 2/2: Better changelog for xwidgets
Date: Mon, 2 Feb 2015 11:53:09 +0100 [thread overview]
Message-ID: <21711.22293.636826.987232@a1i15.kph.uni-mainz.de> (raw)
In-Reply-To: <87y4og7n9t.fsf@engster.org>
>>>>> On Mon, 02 Feb 2015, David Engster wrote:
> 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?
That's probably the best what can be done without rewriting the
history. It should be done soon, though.
Ulrich
next prev parent reply other threads:[~2015-02-02 10:53 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20150201003025.18138.95966@vcs.savannah.gnu.org>
[not found] ` <E1YHiQk-0004jf-UH@vcs.savannah.gnu.org>
2015-02-01 6:11 ` [Emacs-diffs] xwidget 9fe732a 2/2: Better changelog for xwidgets Dmitry Gutov
2015-02-01 8:50 ` joakim
2015-02-01 10:53 ` Paul Eggert
2015-02-01 15:46 ` joakim
2015-02-01 16:09 ` Dmitry Gutov
2015-02-01 16:17 ` joakim
2015-02-01 16:30 ` Dmitry Gutov
2015-02-01 19:48 ` joakim
2015-02-01 19:53 ` Paul Eggert
2015-02-01 19:59 ` joakim
2015-02-01 20:05 ` Dmitry Gutov
2015-02-01 20:08 ` David Engster
2015-02-01 20:18 ` Dmitry Gutov
2015-02-01 20:21 ` David Engster
2015-02-03 22:38 ` joakim
2015-02-03 23:42 ` Paul Eggert
2015-02-04 15:59 ` joakim
2015-02-04 18:57 ` joakim
2015-02-05 0:38 ` Paul Eggert
2015-02-05 15:54 ` joakim
2015-02-05 16:17 ` Paul Eggert
2015-02-09 11:50 ` joakim
2015-02-09 11:56 ` joakim
2015-02-09 19:47 ` Paul Eggert
2015-02-09 20:24 ` joakim
2015-02-09 22:20 ` Paul Eggert
2015-02-10 18:27 ` joakim
2015-02-01 15:36 ` Eli Zaretskii
2015-02-01 15:51 ` David Engster
2015-02-01 15:52 ` joakim
2015-02-01 16:04 ` David Engster
2015-02-01 16:04 ` Eli Zaretskii
2015-02-01 16:05 ` Andreas Schwab
2015-02-01 16:11 ` David Engster
2015-02-01 16:15 ` Andreas Schwab
2015-02-01 16:18 ` joakim
2015-02-01 19:29 ` David Engster
2015-02-01 19:39 ` Dmitry Gutov
2015-02-01 19:56 ` Eli Zaretskii
2015-02-01 20:41 ` Dmitry Gutov
2015-02-02 3:30 ` Eli Zaretskii
2015-02-02 8:03 ` David Engster
2015-02-02 10:53 ` Ulrich Mueller [this message]
2015-02-02 16:30 ` Eli Zaretskii
2015-02-02 23:19 ` Stefan Monnier
2015-02-02 1:35 ` Stephen J. Turnbull
2015-02-02 1:57 ` Dmitry Gutov
2015-02-02 2:12 ` Stephen J. Turnbull
2015-02-02 2:21 ` Dmitry Gutov
2015-02-02 3:45 ` Stephen J. Turnbull
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=21711.22293.636826.987232@a1i15.kph.uni-mainz.de \
--to=ulm@gentoo.org \
--cc=deng@randomsample.de \
--cc=dgutov@yandex.ru \
--cc=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=joakim@verona.se \
--cc=schwab@linux-m68k.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.