diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-04-12 16:46:42 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-04-12 16:46:42 -0700 |
| commit | c736becc94b1d3f026e1144731c17359a755d23f (patch) | |
| tree | 0e7eb7b0a6e93bb0dfc1f93d1e00fdf2f99bd0ef | |
| parent | 3e52effcf6efa9ef27b3d67d13f535a0381e3bf2 (diff) | |
| parent | e892dc713e6b0881320d4c65bff7a49d44752bda (diff) | |
| download | git-c736becc94b1d3f026e1144731c17359a755d23f.tar.gz git-c736becc94b1d3f026e1144731c17359a755d23f.tar.xz | |
Merge branch 'sb/doc-upstream-branch'
* sb/doc-upstream-branch:
Documentation: Introduce "upstream branch"
| -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 3afd12474..f3ebd2f9a 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 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 |