diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-05-29 16:57:17 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-05-29 16:57:17 -0700 |
| commit | c710296399a86586e3a5e24ea8519ea2442ab7cf (patch) | |
| tree | eb0d0bf25b3098a12d15f4a2921f16ecaaa2756f /gitglossary.html | |
| parent | b6595471f5299e8b13181e09072b486dd0ad6261 (diff) | |
| download | git-htmldocs-c710296399a86586e3a5e24ea8519ea2442ab7cf.tar.gz | |
Autogenerated HTML docs for v1.8.3-101-g727a4
Diffstat (limited to 'gitglossary.html')
| -rw-r--r-- | gitglossary.html | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/gitglossary.html b/gitglossary.html index 8c527cac8..9a026d858 100644 --- a/gitglossary.html +++ b/gitglossary.html @@ -1435,12 +1435,13 @@ should not be combined with other pathspec.</p></div> </dt>
<dd>
<p>
- A regular Git <a href="#def_branch">branch</a> that is used to follow changes from
- another <a href="#def_repository">repository</a>. A remote-tracking
- branch should not contain direct modifications or have local commits
- made to it. A remote-tracking branch can usually be
- identified as the right-hand-side <a href="#def_ref">ref</a> in a Pull:
- <a href="#def_refspec">refspec</a>.
+ A <a href="#def_ref">ref</a> that is used to follow changes from another
+ <a href="#def_repository">repository</a>. It typically looks like
+ <em>refs/remotes/foo/bar</em> (indicating that it tracks a branch named
+ <em>bar</em> in a remote named <em>foo</em>), and matches the right-hand-side of
+ a configured fetch <a href="#def_refspec">refspec</a>. A remote-tracking
+ branch should not contain direct modifications or have local
+ commits made to it.
</p>
</dd>
<dt class="hdlist1">
|