From: Paul Bolle <pebolle@tiscali.nl>
Date: Fri, 22 Oct 2010 20:16:25 GMT
Subject: Re: Git terminology: remote, add, track, stage, etc.
Message-ID: <1287778585.2025.14.camel@localhost.localdomain>
In-Reply-To: <AANLkTinGuVm8gib9r7omVV9hHw8B-iBQGgsv+b6wb5=Q@mail.gmail.com>

On Tue, 2010-10-19 at 11:09 -0400, Eugene Sajine wrote:
> There should be some different consistent and not inter-crossing
> naming for the origin's master branch (on the remote side), for the
> local origin/master and for local master that is a tracking branch.
> The only way i found so far to explain this is actually via the naming
> syntax where having / in the name of the branch means remote branch. I
> was a bit surprised that i can create a local branch with a slash in
> the name - probably it should be prohibited.

Allowing local branches with a slash in their name is a feature I use
heavily. Ie, in general my local repositories use this scheme:

$ git branch
* master
  $BRANCH_F00
  $USER/$TOPIC_FOO
  $USER/$TOPIC_BAR
  [...]
  $USER/$TOPIC_BAZ

This makes it trivial to quickly distinguish my (local) work from other
people's (remote) work. Does the benefit of naming clarity justify
prohibiting that scheme?


Paul Bolle