From: Ben Greear <greearb@candelatech.com>
To: Shawn Pearce <spearce@spearce.org>
Cc: git@vger.kernel.org
Subject: Re: Question on multi-level git repository heiarchy.
Date: Fri, 27 Oct 2006 07:05:02 -0700 [thread overview]
Message-ID: <4542120E.1050903@candelatech.com> (raw)
In-Reply-To: <20061027052517.GB29057@spearce.org>
Shawn Pearce wrote:
> Ben Greear <greearb@candelatech.com> wrote:
>
>> I want to create an intermediate level..something like:
>>
>> kernel.org git tree
>> |
>> my git master tree
>> / \
>> work-station-1 work-station-2 ....
>>
>
>
>> I then did a git checkout -f master on the
>> pub server and did a pull from the upstream kernel.
>> This seemed to work fine.
>>
>
> Ah, what you really want here is to make your "my git master tree"
> a bare repostiory and use fetch instead of pull. This way you
> don't need to maintain a working directory of files associated
> with that repository. So assuming you have "mygitmastertree"
> as the directory do:
>
> mv mygitmastertree/.git mygitmastertree.git
> rm -rf mygitmastertree
>
> and update your workstation .git/remotes/origin files such
> that the URL line reads ".../mygitmastertree.git" rather than
> ".../mygitmastertree/.git".
>
> Then to update "mygitmastertree" with recent changes you can use
> git fetch rather than git pull:
>
> git --git-dir mygitmastertree.git fetch
>
Ok, I made those changes...
>
>
>> Then, on the work-station, I did a git checkout -f master, and also did
>> a pull.
>> In this case, it seems that it is trying to merge with changes in the
>> lf_v2.6.18 branch
>> instead of the the main 'master' tree (see below).
>>
>
> When you use "git pull" with no additional arguments the first
> branch listed in a Pull: line of .git/remotes/origin will be the
> branch merged into the current branch. I don't know what that
> branch is listed as in your workstation tree but from what you
> described it sounds like it may be that lf_v2.6.18 branch, which
> is why its trying to merge it.
>
That is certainly not intuitive.
I want to synchronize the entire git repo, including all branches. How
would I go
about doing that?
Is there any way to recover my currently mangled tree on the
workstation, or do I need
to start fresh there? If I start fresh, do I re-clone, or is there some
better way to get
the synchronization that I want?
Thanks,
Ben
--
Ben Greear <greearb@candelatech.com>
Candela Technologies Inc http://www.candelatech.com
next prev parent reply other threads:[~2006-10-27 14:03 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-10-27 5:12 Question on multi-level git repository heiarchy Ben Greear
2006-10-27 5:25 ` Shawn Pearce
2006-10-27 14:05 ` Ben Greear [this message]
2006-10-27 15:31 ` Andy Parkins
2006-11-16 0:43 ` Ben Greear
-- strict thread matches above, loose matches on Subject: below --
2006-10-27 19:26 linux
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=4542120E.1050903@candelatech.com \
--to=greearb@candelatech.com \
--cc=git@vger.kernel.org \
--cc=spearce@spearce.org \
/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;
as well as URLs for NNTP newsgroup(s).