From: Maaartin <grajcar1@seznam.cz>
To: git@vger.kernel.org
Subject: Re: Renaming remote branch
Date: Wed, 20 Apr 2011 20:41:59 +0200 [thread overview]
Message-ID: <ion9dn$pgt$1@dough.gmane.org> (raw)
In-Reply-To: <ioajc1$rc$1@dough.gmane.org>
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.
prev parent reply other threads:[~2011-04-20 18:42 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-15 23:12 Renaming remote branch Maaartin
2011-04-20 18:41 ` Maaartin [this message]
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='ion9dn$pgt$1@dough.gmane.org' \
--to=grajcar1@seznam.cz \
--cc=git@vger.kernel.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).