From e892dc713e6b0881320d4c65bff7a49d44752bda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Santi=20B=C3=A9jar?= Date: Tue, 7 Apr 2009 01:24:30 +0200 Subject: Documentation: Introduce "upstream branch" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Santi Béjar Signed-off-by: Junio C Hamano --- Documentation/config.txt | 2 +- Documentation/glossary-content.txt | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'Documentation') diff --git a/Documentation/config.txt b/Documentation/config.txt index ad22cb875..77d3a8e31 100644 --- 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. -* `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:: 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 <> which is not <> from a <>, <>, or any other reference. +[[def_upstream_branch]]upstream branch:: + The default <> that is merged into the branch in + question (or the branch in question is rebased onto). It is configured + via branch..remote and branch..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 <> plus any local changes -- cgit v1.2.1