From: Felipe Contreras Date: Fri, 17 May 2013 20:01:57 GMT Subject: Re: [RFC] New kind of upstream branch: base branch Message-ID: In-Reply-To: <51968311.1020107@bracey.fi> On Fri, May 17, 2013 at 2:20 PM, Kevin Bracey wrote: > 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. If you are in your topic branch, what do you expect 'git pull' to do? And what do you expect 'git push' to do? -- Felipe Contreras