From mboxrd@z Thu Jan 1 00:00:00 1970 Message-ID: <52186429.2000400@web.de> Date: Sat, 24 Aug 2013 09:43:37 +0200 From: Jan Kiszka MIME-Version: 1.0 References: <52147CD7.70400@siemens.com> <52147DF2.8060407@xenomai.org> <52147E94.6070309@siemens.com> <5214802B.9060001@siemens.com> <5214A55E.2070902@xenomai.org> <5214A886.30608@siemens.com> <5214A941.6070302@xenomai.org> <5214AA25.5070500@siemens.com> <5214AB5F.7050302@xenomai.org> <5214C300.40205@siemens.com> <521860C3.6030206@zultron.com> In-Reply-To: <521860C3.6030206@zultron.com> Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Subject: Re: [Xenomai] [RFC] x86 port to kernel 3.10 List-Id: Discussions about the Xenomai project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: John Morris Cc: Xenomai 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: