summaryrefslogtreecommitdiffstats
path: root/glossary-content.txt
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 /glossary-content.txt
parent5865559b9be66a59108c9f38b1e9f4d91201ebc6 (diff)
downloadgit-htmldocs-8401f142a88980c91f3af6f06199e5579c9143c6.tar.gz
Autogenerated HTML docs for v1.8.3.2-804-g0da7a
Diffstat (limited to 'glossary-content.txt')
-rw-r--r--glossary-content.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/glossary-content.txt b/glossary-content.txt
index db2a74df9..dba5062b3 100644
--- a/glossary-content.txt
+++ b/glossary-content.txt
@@ -113,7 +113,7 @@ Note that commands that operate on the history of the current branch
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 _about_ the current branch (e.g. `git
-branch --set-upstream-to` that sets what remote tracking branch the
+branch --set-upstream-to` 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.
@@ -267,7 +267,7 @@ This commit is referred to as a "merge commit", or sometimes just a
The default upstream <<def_repository,repository>>. Most projects have
at least one upstream project which they track. By default
'origin' is used for that purpose. New upstream updates
- will be fetched into remote <<def_remote_tracking_branch,remote-tracking branches>> named
+ will be fetched into <<def_remote_tracking_branch,remote-tracking branches>> named
origin/name-of-upstream-branch, which you can see using
`git branch -r`.