Gentoo Archives: gentoo-dev

From: "W. Trevor King" <wking@×××××××.us>
To: gentoo-dev@l.g.o
Subject: Re: [gentoo-dev] Re: Portage Git migration - clean cut or git-cvsserver
Date: Fri, 01 Jun 2012 16:20:09
Message-Id: 20120601161823.GA11148@odin.tremily.us
In Reply to: Re: [gentoo-dev] Re: Portage Git migration - clean cut or git-cvsserver by Kent Fredric
1 On Sat, Jun 02, 2012 at 03:56:43AM +1200, Kent Fredric wrote:
2 > You can however merge dissimilar histories with no common parents if
3 > you know what you're doing. It does warn you, but it still lets you do
4 > it.
5 >
6 > …
7 >
8 > Yeah, selectively pulling in files with histories however is hard,
9 > I've occasionally been fussed enough to create temporary copies of
10 > branches, and then iterate over their history so the history is
11 > reduced to changes only for a small selection of files, but its
12 > largely lots of work, and I can't remember how to do it every time I
13 > go to do it -_-
14
15 I have to look it up every time I need it too, but the procedure
16 involves `git filter-branch` [1,2], and actually is pretty easy to
17 wrap your head around, even though the paricular commands are not so
18 easy to remember.
19
20 Trevor
21
22 [1]: http://stackoverflow.com/questions/7375528/
23 [2]: http://gbayer.com/development/moving-files-from-one-git-repository-to-another-preserving-history/
24
25 --
26 This email may be signed or encrypted with GnuPG (http://www.gnupg.org).
27 For more information, see http://en.wikipedia.org/wiki/Pretty_Good_Privacy

Attachments

File name MIME type
signature.asc application/pgp-signature