From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Wed, 09 Jul 2008 18:42:22 GMT
Subject: Re: Merging a foreign tree into a bare repository.
Message-ID: <alpine.DEB.1.00.0807092040360.4010@eeepc-johanness>
In-Reply-To: <m3lk0bdkyl.fsf@localhost.localdomain>

Hi,

On Wed, 9 Jul 2008, Jakub Narebski wrote:

> Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
> 
> > On Tue, 8 Jul 2008, Dave Quigley wrote:
> > 
> > > I tried to then merge them but you need a working directory to merge the 
> > > changes which makes sense.
> > 
> > Of course it does.  Merging runs the risk of conflicts, and you need a 
> > working directory for that.
> > 
> > > How would one go about doing this with a bare repository?
> > 
> > Very easy: clone it ("non-barely"), merge, and push back the results.
> > 
> > You _need_ a working directory for the merge.
> 
> Or, alternatively, you can tell git where you want to have working
> directory with '--work-tree' parameter to git wrapper,

... which runs the risk of you forgetting to specify the same working 
directory all the time.

Which is the reason I did not suggest it.

> You can also set core.worktree configuration variable...

... effectively turning it into a non-bare repository.  Was that the 
question, how to turn a bare repository into a non-bare one?

Ciao,
Dscho