From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 05 Feb 2013 22:29:31 GMT
Subject: Re: importing two different trees into a fresh git repo
Message-ID: <7va9riqtro.fsf@alter.siamese.dyndns.org>
In-Reply-To: <CAPKkNb6+ojb+uvBW+AkhGrhjR85LrJEbmR0KmvaKYb2Cj5Aa4g@mail.gmail.com>

"Constantine A. Murenin" <mureninc@gmail.com> writes:

> I have two distinct trees that were not managed by any RCS, and I'd
> like to import them into a single repository into two separate orphan
> branches, then make sense of what's in there, merge, and unify into
> 'master'.
>
> (To give some context, it's /etc/nginx config files from nginx/1.0.12
> on Debian 6 and nginx/1.2.2 on OpenBSD 5.2.)

As these come from two totally separate sources, I'd find it more
natural to do two repositories, deb-nginx-conf and obsd-nginx-conf,
each with one commit and then pull one into the other (or pull both
to master-nginx-conf if you really wanted to), to me.