diff options
| author | Santi Béjar <santi@agolina.net> | 2009-04-07 01:24:30 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-04-07 22:04:41 -0700 |
| commit | e892dc713e6b0881320d4c65bff7a49d44752bda (patch) | |
| tree | 82318fab0925c0a72f4f0c5bb11e52366abbefda | |
| parent | 01eadafccbeae485503f5373dc60cc5a04877c3b (diff) | |
| download | git-e892dc713e6b0881320d4c65bff7a49d44752bda.tar.gz git-e892dc713e6b0881320d4c65bff7a49d44752bda.tar.xz | |
Documentation: Introduce "upstream branch"
Signed-off-by: Santi Béjar <santi@agolina.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/config.txt | 2 | ||||
| -rw-r--r-- | Documentation/glossary-content.txt | 6 |
2 files changed, 7 insertions, 1 deletions
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 <<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 |