X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fglossary-content.txt;h=43d84d15e921435ba4629a7d8c18021d16f89223;hb=1b52ac5935c3773596fa41f6cf83578ab86b6b83;hp=9afca755ed309b5bdf3cd293d6120f676f1053cd;hpb=54e0e6edfa60f84b582112804365e207e70f44a6;p=git.git

diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt
index 9afca755e..43d84d15e 100644
--- a/Documentation/glossary-content.txt
+++ b/Documentation/glossary-content.txt
@@ -262,7 +262,7 @@ This commit is referred to as a "merge commit", or sometimes just a
 	'origin' is used for that purpose. New upstream updates
 	will be fetched into remote <<def_tracking_branch,tracking branches>> named
 	origin/name-of-upstream-branch, which you can see using
-	"`git branch -r`".
+	`git branch -r`.
 
 [[def_pack]]pack::
 	A set of objects which have been compressed into one file (to save space
@@ -449,7 +449,13 @@ This commit is referred to as a "merge commit", or sometimes just a
 	An <<def_object,object>> which is not <<def_reachable,reachable>> from a
 	<<def_branch,branch>>, <<def_tag,tag>>, or any other reference.
 
+[[def_upstream_branch]]upstream branch::
+	The default <<def_branch,branch>> that is merged into the branch in
+	question (or the branch in question is rebased onto). It is configured
+	via branch.<name>.remote and branch.<name>.merge. If the upstream branch
+	of 'A' is 'origin/B' sometimes we say "'A' is tracking 'origin/B'".
+
 [[def_working_tree]]working tree::
-	The tree of actual checked out files.  The working tree is
-	normally equal to the <<def_HEAD,HEAD>> plus any local changes
-	that you have made but not yet committed.
+	The tree of actual checked out files.  The working tree normally
+	contains the contents of the <<def_HEAD,HEAD>> commit's tree,
+	plus any local changes that you have made but not yet committed.