git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Kevin Bracey <kevin@bracey.fi>
To: Felipe Contreras <felipe.contreras@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [RFC] New kind of upstream branch: base branch
Date: Fri, 17 May 2013 22:20:49 +0300	[thread overview]
Message-ID: <51968311.1020107@bracey.fi> (raw)
In-Reply-To: <CAMP44s3LQ0GN4rrXdpb8Fe0iLeAEm2VjkH6BHK64pmX-xpc7+Q@mail.gmail.com>

On 15/05/2013 23:34, Felipe Contreras wrote:
>   
> I think I'm using 'upstream' for something it was not intended to, and
> I think the current 'upstream' behavior should be split into
> 'upstream' and 'base'.
>
I found myself thinking the same thing. It's really convenient being 
able to set your topic branch's upstream to another local branch, so git 
rebase works without parameters. But then I can't use upstream to point 
to a remote version of that topic branch. I want my topic branch to know 
both that it's based on master (or origin/master), and that it's 
upstream is origin/topic.

So, yes, here's a vote in favour of the general concept.

Kevin

  parent reply	other threads:[~2013-05-17 19:21 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-05-15 20:34 [RFC] New kind of upstream branch: base branch Felipe Contreras
2013-05-15 22:22 ` Philip Oakley
2013-05-16  3:46   ` Felipe Contreras
2013-05-16 19:35     ` Philip Oakley
2013-05-17  0:07       ` Felipe Contreras
2013-05-17 19:20 ` Kevin Bracey [this message]
2013-05-17 19:51   ` Junio C Hamano
2013-05-17 20:15     ` Felipe Contreras
2013-05-18 14:29     ` Kevin Bracey
2013-05-18 18:14       ` Ramkumar Ramachandra
2013-05-18 22:42       ` Felipe Contreras
2013-05-19  6:22       ` Junio C Hamano
2013-05-19  8:12         ` Felipe Contreras
2013-05-17 20:01   ` Felipe Contreras
  -- strict thread matches above, loose matches on Subject: below --
2013-05-15 20:28 Felipe Contreras
2013-05-15 22:20 ` Junio C Hamano
2013-05-15 22:50   ` Junio C Hamano
2013-05-15 23:18     ` Felipe Contreras
2013-05-15 22:56   ` Felipe Contreras
2013-05-15 23:14     ` Junio C Hamano
2013-05-15 23:32       ` Felipe Contreras

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=51968311.1020107@bracey.fi \
    --to=kevin@bracey.fi \
    --cc=felipe.contreras@gmail.com \
    --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).