From: Kevin Bracey Date: Fri, 17 May 2013 19:20:49 GMT Subject: Re: [RFC] New kind of upstream branch: base branch Message-ID: <51968311.1020107@bracey.fi> In-Reply-To: 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