Re: importing two different trees into a fresh git repo

2013-02-06 Thread Jeff King
On Tue, Feb 05, 2013 at 01:46:09PM -0800, Constantine A. Murenin wrote: > I've encountered two problems so far: > > 0. After initialising the repository, I was unable to `git checkout > --orphan Debian-6.0.4-nginx-1.0.12` -- presumably it doesn't work when > the repo is empty? This sounds like a

Re: importing two different trees into a fresh git repo

2013-02-05 Thread Constantine A. Murenin
On 5 February 2013 14:29, Junio C Hamano wrote: > "Constantine A. Murenin" 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 in

Re: importing two different trees into a fresh git repo

2013-02-05 Thread Junio C Hamano
"Constantine A. Murenin" 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/ngi