I'm tracking a couple of other people's projects using git. Some of them
are git repositories, some are svn. For the svn repos I get sometimes a
remote branch called "trunk", sometimes I get "git-svn". For the git
repos I get always the "master" branch and sometimes some more.
I am only interested in the master branch (i.e., master, trunk, or
git-svn, whatever applies). I'd like to make it all work the same, and
ideally name the remote branch "org", so I can do
git checkout master; git fetch-upstream; git rebase org
where "fetch-upstream" is my repository-local alias getting the data
from the upstream (e.g., "git svn fetch"). The fetch works fine, but I'm
failing to rename the remote branch for one repository (I may be using a
wrong term here; what I want is to make the above command line work for
all my repos).
Regards, Maaartin.
On 11-04-16 01:12, Maaartin wrote:
I'm tracking a couple of other people's projects using git. Some of them
are git repositories, some are svn. For the svn repos I get sometimes a
remote branch called "trunk", sometimes I get "git-svn". For the git
repos I get always the "master" branch and sometimes some more.
I am only interested in the master branch (i.e., master, trunk, or
git-svn, whatever applies). I'd like to make it all work the same, and
ideally name the remote branch "org", so I can do
git checkout master; git fetch-upstream; git rebase org
where "fetch-upstream" is my repository-local alias getting the data
from the upstream (e.g., "git svn fetch"). The fetch works fine, but I'm
failing to rename the remote branch for one repository (I may be using a
wrong term here; what I want is to make the above command line work for
all my repos).
I think, I've found a simple solution. For remote git repos I use
[remote "upstream"]
url = ...
fetch = +refs/heads/*:refs/remotes/upstream/*
fetch = +refs/heads/master:refs/remotes/org
thus mapping the remote master also to "refs/remotes/org". For svn repos
I use
[svn-remote "svn"]
url = ...
fetch = :refs/remotes/org
In both cases I get a remote branch "org" (no "git-svn", no
"upstream/org") and that's all I really need for "git rebase org" to do
what I want.
Regards, Maaartin.