[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

help with git

Hi everyone,

I have a question regarding git/debian/upstream.

I have a git repository on git.debian.org for packaging upstream,
and I push/pull from that to my local laptop dev.

I use git-import-org and friends, so the layout is:
$ git branch
where the master is generated from git-import-orig.

I now want to include upstream git into a branch, either the upstream
branch itself, or some other/new one, but I have no idea how
to set that up? 

Can someone help me here? The remote is some

By now I have added a remote to my .git/config:
[remote "upstream-git"]
        url = git://gitorious.org/mu/mu-ng.git
        fetch = +refs/heads/*:refs/remotes/upstream-git/*
        tagopt = --tags

Set up with git remote add --tags upstream-git git://gitorious.org/mu/mu-ng.git

But somehow I don't manage to get a branch that follows that remote.
I tried to add:
[branch "upstream-new"]
        remote = upstream-git
        merge = refs/heads/master
but that tells me:
	Your configuration specifies to merge with the ref 'master'
	from the remote, but no such ref was fetched.

Sorry, I am a bit at loss here. Any suggestions how to do this properly?

Thanks and all the best

Norbert Preining            preining@{jaist.ac.jp, logic.at, debian.org}
JAIST, Japan                                 TeX Live & Debian Developer
DSA: 0x09C5B094   fp: 14DF 2E6C 0307 BE6D AD76  A9C0 D2BF 4AA3 09C5 B094
A rouge blob of food. Glossops, which are generally streaming hot and
highly adhesive invariably fall off your spoon and on to the surface
of your host's highly polished antique-rosewood dining table. If this
has not, or may not have, been noticed by the company present, swanage
(q.v.) may be employed.
			--- Douglas Adams, The Meaning of Liff

Reply to: