summaryrefslogtreecommitdiffstats
path: root/gitglossary.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-07-12 15:47:46 -0700
committerJunio C Hamano <gitster@pobox.com>2013-07-12 15:47:46 -0700
commit8401f142a88980c91f3af6f06199e5579c9143c6 (patch)
tree3bce834aaee41a0b122eb45ab2ce5fb26a747df8 /gitglossary.html
parent5865559b9be66a59108c9f38b1e9f4d91201ebc6 (diff)
downloadgit-htmldocs-8401f142a88980c91f3af6f06199e5579c9143c6.tar.gz
Autogenerated HTML docs for v1.8.3.2-804-g0da7a
Diffstat (limited to 'gitglossary.html')
-rw-r--r--gitglossary.html4
1 files changed, 2 insertions, 2 deletions
diff --git a/gitglossary.html b/gitglossary.html
index 9a026d858..e719be126 100644
--- a/gitglossary.html
+++ b/gitglossary.html
@@ -945,7 +945,7 @@ to point at the new commit.</p></div>
while the HEAD is detached. They update the HEAD to point at the tip
of the updated history without affecting any branch. Commands that
update or inquire information <em>about</em> the current branch (e.g. <code>git
-branch --set-upstream-to</code> that sets what remote tracking branch the
+branch --set-upstream-to</code> that sets what remote-tracking branch the
current branch integrates with) obviously do not work, as there is no
(real) current branch to ask about in this state.</p></div>
</dd>
@@ -1221,7 +1221,7 @@ This commit is referred to as a "merge commit", or sometimes just a
The default upstream <a href="#def_repository">repository</a>. Most projects have
at least one upstream project which they track. By default
<em>origin</em> is used for that purpose. New upstream updates
- will be fetched into remote <a href="#def_remote_tracking_branch">remote-tracking branches</a> named
+ will be fetched into <a href="#def_remote_tracking_branch">remote-tracking branches</a> named
origin/name-of-upstream-branch, which you can see using
<code>git branch -r</code>.
</p>