From: Santi Béjar Date: Mon, 06 Apr 2009 23:24:30 GMT Subject: [PATCH] Documentation: Introduce "upstream branch" Message-ID: <1239060270-15307-1-git-send-email-santi@agolina.net> Signed-off-by: Santi Béjar --- Documentation/config.txt | 2 +- Documentation/glossary-content.txt | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/Documentation/config.txt b/Documentation/config.txt index 3afd124..f3ebd2f 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1215,7 +1215,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 4fc1cf1..86be3ae 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/rebased into another + branch. It is configured via branch..remote and + branch..merge. If the upstream branch of 'A' is 'origin/B' it is + sometimes refered as "'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 -- 1.6.1.258.g7ff14