From: Jan Kiszka <jan.kiszka@web.de>
To: John Morris <john@zultron.com>
Cc: Xenomai <xenomai@xenomai.org>
Subject: Re: [Xenomai] [RFC] x86 port to kernel 3.10
Date: Sat, 24 Aug 2013 09:43:37 +0200 [thread overview]
Message-ID: <52186429.2000400@web.de> (raw)
In-Reply-To: <521860C3.6030206@zultron.com>
On 2013-08-24 09:29, John Morris wrote:
> On 08/21/2013 08:39 AM, Jan Kiszka wrote:
>> Squashing or rebasing (I tried rebase --preserve-merges by now - not
>> usable) means loosing track where the merges came from.
>
> I recently used Peter Wortmann's rebase --interactive script, smartened
> up for preserving merges, to get through a 1200+ commit/80+ merge rebase
> of over a half year's work. Saved a ton of tears (at least).
>
> https://github.com/scpmw/git/commit/33c707d
>
> Explanation in this commit:
>
> https://github.com/scpmw/git/commit/fa11202
>
Cool, thanks for the hint!
Jan
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 263 bytes
Desc: OpenPGP digital signature
URL: <http://www.xenomai.org/pipermail/xenomai/attachments/20130824/46e935bd/attachment.pgp>
prev parent reply other threads:[~2013-08-24 7:43 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-21 8:39 [Xenomai] [RFC] x86 port to kernel 3.10 Jan Kiszka
2013-08-21 8:44 ` Gilles Chanteperdrix
2013-08-21 8:47 ` Jan Kiszka
2013-08-21 8:54 ` Jan Kiszka
2013-08-21 11:32 ` Gilles Chanteperdrix
2013-08-21 11:46 ` Jan Kiszka
2013-08-21 11:49 ` Gilles Chanteperdrix
2013-08-21 11:53 ` Jan Kiszka
2013-08-21 11:58 ` Gilles Chanteperdrix
2013-08-21 13:39 ` Jan Kiszka
2013-08-21 18:23 ` Gilles Chanteperdrix
2013-08-22 7:46 ` Jan Kiszka
2013-08-22 9:37 ` Gilles Chanteperdrix
2013-08-22 16:49 ` Jan Kiszka
2013-08-27 13:31 ` Jan Kiszka
2013-08-24 7:29 ` John Morris
2013-08-24 7:43 ` Jan Kiszka [this message]
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=52186429.2000400@web.de \
--to=jan.kiszka@web.de \
--cc=john@zultron.com \
--cc=xenomai@xenomai.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.
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.