On 15/09/06, Rajkumar S <rajkumars+git@xxxxxxxxx> 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? -- Catalin - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html