diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2009-04-13 02:39:53 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2009-04-13 02:39:53 +0000 |
| commit | 98e32c30fcbbbed199fa402656feffe7f4843784 (patch) | |
| tree | 744ab9b349feac0abdec988a8958f7e4ae1806ae /glossary-content.txt | |
| parent | 55344411a8808b31a1e78c652e8f8aaf336e8202 (diff) | |
| download | git-htmldocs-98e32c30fcbbbed199fa402656feffe7f4843784.tar.gz | |
Autogenerated HTML docs for v1.6.3-rc0
Diffstat (limited to 'glossary-content.txt')
| -rw-r--r-- | glossary-content.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/glossary-content.txt b/glossary-content.txt index 4fc1cf118..572374f7a 100644 --- a/glossary-content.txt +++ b/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 |