Documentation: Introduce "upstream branch"

Signed-off-by: Santi Béjar <santi@agolina.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/config.txt b/Documentation/config.txt
index ad22cb875e54057d7a8246b7c28f44ff90cfd14a..77d3a8e31cbf5399eaf0c6a806db300967fa6f63 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1208,7 +1208,7 @@ push.default::
 * `matching` push all matching branches.
   All branches having the same name in both ends are considered to be
   matching. This is the default.
 * `matching` push all matching branches.
   All branches having the same name in both ends are considered to be
   matching. This is the default.

-* `tracking` push the current branch to the branch it is tracking.
+* `tracking` push the current branch to its upstream branch.

 * `current` push the current branch to a branch of the same name.
 
 rebase.stat::
 * `current` push the current branch to a branch of the same name.
 
 rebase.stat::

diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt
index 4fc1cf1184f84b60ee72a9298d23f0464d2edadf..572374f7a6ff17dd40ad687a2fda24d53f7d730b 100644 (file)
--- 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.
 
        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
 [[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