title: What is the shortname of the "central" Git remote versus my remote?
body: <p>I seem to be getting myself confused between Git terminology versus conventions for <a href="http://git-scm.com/book/en/Git-Basics-Working-with-Remotes#Showing-Your-Remotes" rel="nofollow">remote repo shortnames</a>. Here is the Git setup I have (I believe it's Git-flow-ish and similar to collaborating on Gitorious, GitHub, GitLab and similar sites):</p>
  
  <ol>
  <li>My local repo [a]</li>
  <li>My remote repo [b]</li>
  <li>My colleague's local repo [c]</li>
  <li>My colleague's remote repo [b]</li>
  <li>"Central" remote repo - the one that we consider "final" by convention - used to merge/rebase/release/publish against - called "trunk" in SVN parlance - in our particular workflow there is only one branch here (called <em>master</em>) [b]</li>
  <li>(bonus) My local repo on another machine [d]</li>
  </ol>
  
  <p>[a] Stored on my machine<br>
  [b] Stored on common server<br>
  [c] Stored on colleague's machine<br>
  [d] Hypothetical, but included for completeness</p>
  
  <p>What are the conventional shortnames of the remote repos? And how do I refer to my local repos? Up until now I've been using:</p>
  
  <ol>
  <li>"my local repo"</li>
  <li><code>origin</code> (others would call it <code>d3vid</code> or whatever my username is)</li>
  <li>"your local repo"</li>
  <li><code>alovelace</code> (of course, on her own machine, she would call it <code>origin</code>)</li>
  <li><code>upstream</code> (we all call it this)</li>
  <li>"my other local repo"</li>
  </ol>
  
  <p>Similarly, 5 could be the official remote repo of some project on GitHub, 2 my GitHub clone, 1 and 6 my local copies of that clone, 4 your GitHub clone and 3 your local copy of that clone.</p>
  
  <p>However, the Git setting <code>upstream</code> seems to refer to "the destination remote repo+branch of a local branch". Similarly, <code>origin</code> seems to be a flexible term. I've obviously confused Git's "upstream" with the FLOSS concept of an "upstream project".</p>
  
  <p>So, can anyone clarify - what names <em>should</em> I be giving the remote repos? I'm looking for a documented convention as close to "official" or "de facto" as possible - if it includes references to branch naming conventions, or other stuff I've glossed over, all the better.</p>