From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Jakub Narebski <jnareb@gmail.com>
Cc: Dave Quigley <dpquigl@tycho.nsa.gov>,
Git Mailing List <git@vger.kernel.org>
Subject: Re: Merging a foreign tree into a bare repository.
Date: Wed, 9 Jul 2008 20:42:22 +0200 (CEST) [thread overview]
Message-ID: <alpine.DEB.1.00.0807092040360.4010@eeepc-johanness> (raw)
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
next prev parent reply other threads:[~2008-07-09 18:43 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-09 0:14 Merging a foreign tree into a bare repository Dave Quigley
2008-07-09 0:40 ` Johannes Schindelin
2008-07-09 14:25 ` Alejandro Riveira
2008-07-09 17:27 ` Jakub Narebski
2008-07-09 18:42 ` Johannes Schindelin [this message]
2008-07-09 21:04 ` Eric Raible
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=alpine.DEB.1.00.0807092040360.4010@eeepc-johanness \
--to=johannes.schindelin@gmx.de \
--cc=dpquigl@tycho.nsa.gov \
--cc=git@vger.kernel.org \
--cc=jnareb@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox