From: Santi <sbejar@gmail.com>
To: "Catalin Marinas" <catalin.marinas@gmail.com>
Cc: "Rajkumar S" <rajkumars+git@gmail.com>, git@vger.kernel.org
Subject: Re: Tracking a branch using StGIT
Date: Fri, 15 Sep 2006 13:17:23 +0200 [thread overview]
Message-ID: <8aa486160609150417s288d6540tc8ee6aa83bbf67b4@mail.gmail.com> (raw)
In-Reply-To: <b0943d9e0609150342y6105d8d1o61abb1934da9f51b@mail.gmail.com>
2006/9/15, Catalin Marinas <catalin.marinas@gmail.com>:
> On 15/09/06, Rajkumar S <rajkumars+git@gmail.com> wrote:
> > I am using StGIT to track a branch of a remote git repository
> > (actually a remote cvs repository, which I am tracking cvsimport)
> [...]
> > The .git/remotes/origin is
> > URL: /usr/local/pfSense/upstream/pfSense/.git
> > Pull: refs/heads/master:refs/heads/origin
> > Pull: refs/heads/avendor:refs/heads/avendor
> > Pull: refs/heads/Package-Reorg-2005:refs/heads/Package-Reorg-2005
> > Pull: refs/heads/RELENG_1:refs/heads/RELENG_1
> >
> > My requirement is to track RELENG_1 branch with StGIT while
> > maintaining my own patches. but when I do a stg pull the messages are:
> [...]
> > It seems StGIT is trying to merge the origin branch from remote to
> > RELENG_1 of local. Is there a way to get RELENG_1 of remote to merge
> > with MyBranch (clone of "RELENG_1") of local?
>
> After StGIT pops all the patches, it just calls "git pull origin". My
> understanding of GIT is that this should update local RELENG_1 with
> the remote RELENG_1 from the "origin" repository. Anything wrong with
> my assumptions?
>
No. But the it merge the first pull line in .git/remotes/origin into
the current branch. So he only has to put the RELENG_1 line the first,
as:
URL: /usr/local/pfSense/upstream/pfSense/.git
Pull: refs/heads/RELENG_1:refs/heads/RELENG_1
Pull: refs/heads/master:refs/heads/origin
Pull: refs/heads/avendor:refs/heads/avendor
Pull: refs/heads/Package-Reorg-2005:refs/heads/Package-Reorg-2005
Santi
next prev parent reply other threads:[~2006-09-15 11:18 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-09-15 8:20 Tracking a branch using StGIT Rajkumar S
2006-09-15 10:42 ` Catalin Marinas
2006-09-15 10:58 ` Andy Whitcroft
2006-09-15 11:17 ` Santi [this message]
2006-09-15 11:34 ` Rajkumar S
2006-09-15 11:32 ` Rajkumar S
2006-09-15 11:42 ` Jakub Narebski
2006-09-15 11:59 ` Rajkumar S
2006-09-15 12:09 ` Jakub Narebski
2006-09-15 12:18 ` Rajkumar S
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=8aa486160609150417s288d6540tc8ee6aa83bbf67b4@mail.gmail.com \
--to=sbejar@gmail.com \
--cc=catalin.marinas@gmail.com \
--cc=git@vger.kernel.org \
--cc=rajkumars+git@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;
as well as URLs for NNTP newsgroup(s).