X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fglossary-content.txt;h=572374f7a6ff17dd40ad687a2fda24d53f7d730b;hb=2d430c713372fc21f9acf1d8b745e7f4fbbe336c;hp=4fc1cf1184f84b60ee72a9298d23f0464d2edadf;hpb=d291a9a6c8165efee95b3c1ceb814c39460ddbea;p=git.git

diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt
index 4fc1cf118..572374f7a 100644
--- a/Documentation/glossary-content.txt
+++ b/Documentation/glossary-content.txt
@@ -449,6 +449,12 @@ 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